diff options
| author | Xin Li <delphij@google.com> | 2020-08-27 10:16:06 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-08-27 10:16:06 -0700 |
| commit | 128d9d29db0bb739d1afb760b7854c4367532e6d (patch) | |
| tree | 37346613b4004b372d58242c0a71879441db7d7f | |
| parent | dfb247f6972600aac38c4ce8398e1c726b2f39bd (diff) | |
| parent | cfee8e1cf68a83c771f69388703383bf1487871a (diff) | |
| download | hikey-temp_sam_168057903.tar.gz | |
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903
Bug: 166295507
Merged-In: I0af7dcf183c7ffe110590e539177bbc7ff69cb27
Change-Id: I4c6584a78c1296b9fe65edeafe7aba3f143f3b56
| -rw-r--r-- | device-common.mk | 3 | ||||
| -rw-r--r-- | init.common.rc | 3 | ||||
| -rw-r--r-- | manifest.xml | 18 |
3 files changed, 1 insertions, 23 deletions
diff --git a/device-common.mk b/device-common.mk index 12ed236d..0721f01d 100644 --- a/device-common.mk +++ b/device-common.mk @@ -76,7 +76,6 @@ PRODUCT_PACKAGES += \ android.hardware.audio@4.0-impl:32 \ android.hardware.audio.effect@4.0-impl:32 \ android.hardware.audio@2.0-service \ - android.hardware.broadcastradio@1.0-impl \ android.hardware.soundtrigger@2.0-impl \ android.hardware.bluetooth.audio@2.0-impl @@ -86,8 +85,6 @@ PRODUCT_PACKAGES += \ android.hardware.drm@1.0-impl \ android.hardware.drm@1.0-service -PRODUCT_PACKAGES += libGLES_android - # Graphics HAL PRODUCT_PACKAGES += \ android.hardware.graphics.allocator@2.0-impl \ diff --git a/init.common.rc b/init.common.rc index 53f446c9..1ae164b7 100644 --- a/init.common.rc +++ b/init.common.rc @@ -109,8 +109,7 @@ service watchdogd /system/bin/watchdogd 10 20 oneshot seclabel u:r:watchdogd:s0 -service bugreport /system/bin/dumpstate -d -p -B -z \ - -o /data/user_de/0/com.android.shell/files/bugreports/bugreport +service bugreport /system/bin/dumpstate -d -p -z class main disabled oneshot diff --git a/manifest.xml b/manifest.xml index fd6f383e..42b8a8f5 100644 --- a/manifest.xml +++ b/manifest.xml @@ -165,22 +165,4 @@ <instance>default</instance> </interface> </hal> - <hal format="hidl"> - <name>android.hardware.wifi.hostapd</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IHostapd</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.wifi.supplicant</name> - <transport>hwbinder</transport> - <version>1.2</version> - <interface> - <name>ISupplicant</name> - <instance>default</instance> - </interface> - </hal> </manifest> |