diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-09-17 17:53:10 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-09-17 17:53:10 +0000 |
| commit | 1d21638841907c459b63a5fad6f4a5c3462b2bc3 (patch) | |
| tree | 3c5c55fabec022a8d27a4099c7b69eef4b68f72c | |
| parent | 5e8c1918a8f5a7fff9bd481a381918e5e1888b93 (diff) | |
| parent | 62c8cac881067d8d2fb119369f757571cf5ec537 (diff) | |
| download | device_generic_trusty-simpleperf-release.tar.gz device_generic_trusty-simpleperf-release.tar.bz2 device_generic_trusty-simpleperf-release.zip | |
Snap for 6844436 from 62c8cac881067d8d2fb119369f757571cf5ec537 to simpleperf-releasesimpleperf-release
Change-Id: I7dc1cf09dc0dcda46083082a4a4f1ec81463516e
| -rw-r--r-- | init.qemu_trusty.rc | 3 | ||||
| -rw-r--r-- | manifest.xml | 38 | ||||
| -rw-r--r-- | qemu_trusty_base.mk | 2 |
3 files changed, 3 insertions, 40 deletions
diff --git a/init.qemu_trusty.rc b/init.qemu_trusty.rc index 0adfad0..a7c605d 100644 --- a/init.qemu_trusty.rc +++ b/init.qemu_trusty.rc @@ -101,8 +101,7 @@ service fingerprintd /system/bin/fingerprintd class late_start user system -service bugreport /system/bin/dumpstate -d -p -B \ - -o /data/user_de/0/com.android.shell/files/bugreports/bugreport +service bugreport /system/bin/dumpstate -d -p class main disabled oneshot diff --git a/manifest.xml b/manifest.xml index 8c39798..d3cbdb2 100644 --- a/manifest.xml +++ b/manifest.xml @@ -13,8 +13,6 @@ </interface> <fqname>@1.1::ICryptoFactory/clearkey</fqname> <fqname>@1.1::IDrmFactory/clearkey</fqname> - <fqname>@1.1::ICryptoFactory/widevine</fqname> - <fqname>@1.1::IDrmFactory/widevine</fqname> </hal> <hal format="hidl"> <name>android.hardware.audio.effect</name> @@ -89,15 +87,6 @@ </interface> </hal> <hal format="hidl"> - <name>android.hardware.broadcastradio</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IBroadcastRadioFactory</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> <name>android.hardware.camera.provider</name> <transport>hwbinder</transport> <version>2.4</version> @@ -147,33 +136,6 @@ </interface> </hal> <hal format="hidl"> - <name>android.hardware.wifi</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IWifi</name> - <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.0</version> - <interface> - <name>ISupplicant</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> <name>android.hardware.health</name> <transport>hwbinder</transport> <version>2.0</version> diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk index 438edc3..815d93b 100644 --- a/qemu_trusty_base.mk +++ b/qemu_trusty_base.mk @@ -133,5 +133,7 @@ PRODUCT_BOOT_JARS := \ PRODUCT_UPDATABLE_BOOT_JARS := \ com.android.conscrypt:conscrypt \ + com.android.os.statsd:framework-statsd \ + com.android.wifi:framework-wifi \ com.android.tethering:framework-tethering \ |