Snap for 6877830 from 62c8cac881067d8d2fb119369f757571cf5ec537 to sdk-releasesdk-release

Change-Id: I6b96f6dbe80b79bb673cbfa8261195c7c2394a42

7 files changed, 23 insertions, 40 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index d39346e..5d2a8ed 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -59,3 +59,6 @@ BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
 
 # Specify HALs
 DEVICE_MANIFEST_FILE := device/generic/trusty/manifest.xml
+
+# Enable full VNDK support
+BOARD_VNDK_VERSION := current
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 ba0152e..815d93b 100644
--- a/qemu_trusty_base.mk
+++ b/qemu_trusty_base.mk
@@ -62,6 +62,16 @@ PRODUCT_PACKAGES += \
     vendor_compatibility_matrix.xml \
     vendor_manifest.xml \
 
+# Devices that inherit from build/make/target/product/base.mk always have
+# /system/system_ext/etc/vintf/manifest.xml generated. And build-time VINTF
+# checks assume that. Since we don't inherit from base.mk, add the dependency
+# here manually.
+PRODUCT_PACKAGES += \
+    system_ext_manifest.xml \
+
+# Skip VINTF checks for kernel configs
+PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
+
 # Ensure boringssl NIAP check won't reboot us
 PRODUCT_PACKAGES += \
     com.android.conscrypt \
@@ -100,6 +110,7 @@ PRODUCT_COPY_FILES += \
 # for Trusty
 $(call inherit-product, system/core/trusty/trusty-base.mk)
 $(call inherit-product, system/core/trusty/trusty-storage.mk)
+$(call inherit-product, system/core/trusty/trusty-test.mk)
 
 # Test Utilities
 PRODUCT_PACKAGES += \
@@ -122,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 \
 
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 22c1f88..3153bd1 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -1,6 +1,8 @@
 /dev/trusty-ipc-dev0                 u:object_r:tee_device:s0
 /dev/vport3p1                        u:object_r:rpmb_virt_device:s0
+/dev/vport3p2                        u:object_r:spi_virt_device:s0
 /vendor/bin/dhcpclient               u:object_r:dhcpclient_exec:s0
+/vendor/bin/spiproxyd                u:object_r:tee_exec:s0
 /vendor/bin/storageproxyd            u:object_r:tee_exec:s0
 /data/vendor/var/run(/.*)?           u:object_r:varrun_file:s0
 /data/vendor/ss(/.*)?                u:object_r:tee_data_file:s0
diff --git a/sepolicy/spiproxyd.te b/sepolicy/spiproxyd.te
new file mode 100644
index 0000000..af35110
--- /dev/null
+++ b/sepolicy/spiproxyd.te
@@ -0,0 +1,3 @@
+type spi_virt_device, dev_type;
+
+allow tee spi_virt_device:chr_file { open read write };
diff --git a/ueventd.qemu_trusty.rc b/ueventd.qemu_trusty.rc
index 0fd832e..159408a 100644
--- a/ueventd.qemu_trusty.rc
+++ b/ueventd.qemu_trusty.rc
@@ -1,2 +1,3 @@
 /dev/vport3p1             0660   system     system
+/dev/vport3p2             0660   system     system
 /dev/trusty-ipc-dev0      0660   system     drmrpc