diff options
| author | Xin Li <delphij@google.com> | 2020-08-27 10:16:04 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-08-27 10:16:04 -0700 |
| commit | 08438270b3038b80a3ab745f385119ce46edfba4 (patch) | |
| tree | 88c2c6cbb690f76755c12411ef4f00649e0ca80a | |
| parent | 3442ec2c397c979b92944ee743572751c6f174bb (diff) | |
| parent | 06e354ceb750402c296c34023da925ff41050a17 (diff) | |
| download | device_generic_trusty-08438270b3038b80a3ab745f385119ce46edfba4.tar.gz device_generic_trusty-08438270b3038b80a3ab745f385119ce46edfba4.tar.bz2 device_generic_trusty-08438270b3038b80a3ab745f385119ce46edfba4.zip | |
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I49dd7dbbe225d98fdd637c3c3cd570fe8a4b9669
Change-Id: I143a0b43a5d671d6c196c079924f54c383cb151d
| -rw-r--r-- | init.qemu_trusty.rc | 3 | ||||
| -rw-r--r-- | manifest.xml | 38 |
2 files changed, 1 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> |