commit 3cd3469fa75bee9dd66196487ff88616109c6022
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 14 05:02:57 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 14 05:02:57 2020 +0000
tree c895502b8e9c0519503b78316c56e579ba0830bd
parent 42b2be02dfbbf408ad83b3d4b4f29b26c4ec163d
parent 7a9f007a261faecd703b01e64fcb3eaf4dd74647

Merge "Attach vendor_property_type to properties"

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 12ed236..0721f01 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -76,7 +76,6 @@
     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 @@
     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 \

init.common.rc

diff --git a/init.common.rc b/init.common.rc
index 53f446c..1ae164b 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -109,8 +109,7 @@
     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

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index fd6f383..42b8a8f 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>