commit 2f97c3c023eb1fafccc30d8761030df5713be4be
author Phil Burk <philburk@google.com> Wed Sep 02 00:45:50 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 02 00:45:50 2015 +0000
tree 3488c17cc22713e540def750098cce508981dae3
parent cd312d5af3a2888de87ea643acb253d695626334
parent 3109327f8a93439fe191643cd428ed3f0c279308

Merge "Fugu Audio HAL: allow EAC3 at low sample rates" into mnc-dev

proprietary-blobs.txt

diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt
index 8f5d162..f7074f5 100644
--- a/proprietary-blobs.txt
+++ b/proprietary-blobs.txt
@@ -210,9 +210,6 @@
 /system/vendor/bin/pvrtld
 /system/vendor/firmware/BCM4350C0.hcd
 /system/vendor/firmware/BCM4350C0_SR2.hcd
-/system/vendor/firmware/game_controller.hex
-/system/vendor/firmware/nexus_tv_gamepad.hex
-/system/vendor/firmware/nexus_tv_remote.hex
 /system/vendor/firmware/PR-ModelCert
 /system/vendor/lib/drm/libdrmwvmplugin.so
 /system/vendor/lib/egl/libEGL_POWERVR_ROGUE.so

self-extractors/extract-lists.txt

diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index 0300af4..540f909 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -207,9 +207,6 @@
             system/vendor/bin/pvrhwperf \
             system/vendor/bin/pvrsrvctl \
             system/vendor/bin/pvrtld \
-            system/vendor/firmware/game_controller.hex \
-            system/vendor/firmware/nexus_tv_gamepad.hex \
-            system/vendor/firmware/nexus_tv_remote.hex \
             system/vendor/firmware/PR-ModelCert \
             system/vendor/lib/egl/libEGL_POWERVR_ROGUE.so \
             system/vendor/lib/egl/libGLESv1_CM_POWERVR_ROGUE.so \

self-extractors/intel/staging/device-partial.mk

diff --git a/self-extractors/intel/staging/device-partial.mk b/self-extractors/intel/staging/device-partial.mk
index b586bbc..0ce7602 100644
--- a/self-extractors/intel/staging/device-partial.mk
+++ b/self-extractors/intel/staging/device-partial.mk
@@ -196,9 +196,6 @@
     vendor/intel/fugu/proprietary/pvrhwperf:system/vendor/bin/pvrhwperf:intel \
     vendor/intel/fugu/proprietary/pvrsrvctl:system/vendor/bin/pvrsrvctl:intel \
     vendor/intel/fugu/proprietary/pvrtld:system/vendor/bin/pvrtld:intel \
-    vendor/intel/fugu/proprietary/game_controller.hex:system/vendor/firmware/game_controller.hex:intel \
-    vendor/intel/fugu/proprietary/nexus_tv_gamepad.hex:system/vendor/firmware/nexus_tv_gamepad.hex:intel \
-    vendor/intel/fugu/proprietary/nexus_tv_remote.hex:system/vendor/firmware/nexus_tv_remote.hex:intel \
     vendor/intel/fugu/proprietary/PR-ModelCert:system/vendor/firmware/PR-ModelCert:intel \
     vendor/intel/fugu/proprietary/libEGL_POWERVR_ROGUE.so:system/vendor/lib/egl/libEGL_POWERVR_ROGUE.so:intel \
     vendor/intel/fugu/proprietary/libGLESv1_CM_POWERVR_ROGUE.so:system/vendor/lib/egl/libGLESv1_CM_POWERVR_ROGUE.so:intel \

sepolicy/adbd.te

diff --git a/sepolicy/adbd.te b/sepolicy/adbd.te
new file mode 100644
index 0000000..1d57b2b
--- /dev/null
+++ b/sepolicy/adbd.te
@@ -0,0 +1,2 @@
+allow adbd graphics_device:dir search;
+allow adbd surfaceflinger:fifo_file rw_file_perms;

vendor_owner_info.txt

diff --git a/vendor_owner_info.txt b/vendor_owner_info.txt
index 2f64412..d278fc1 100644
--- a/vendor_owner_info.txt
+++ b/vendor_owner_info.txt
@@ -194,9 +194,6 @@
 system/vendor/bin/pvrtld:intel
 system/vendor/firmware/BCM4350C0.hcd:broadcom
 system/vendor/firmware/BCM4350C0_SR2.hcd:broadcom
-system/vendor/firmware/game_controller.hex:intel
-system/vendor/firmware/nexus_tv_gamepad.hex:intel
-system/vendor/firmware/nexus_tv_remote.hex:intel
 system/vendor/firmware/PR-ModelCert:intel
 system/vendor/lib/drm/libdrmwvmplugin.so:widevine
 system/vendor/lib/egl/libEGL_POWERVR_ROGUE.so:intel