Merge "Revert "O is API 26"" into oc-dev
diff --git a/private/app.te b/private/app.te
index d44cc88..d6d407a 100644
--- a/private/app.te
+++ b/private/app.te
@@ -282,6 +282,9 @@
# Allow app access to mediacodec (IOMX HAL)
binder_call({ appdomain -isolated_app }, mediacodec)
+# Allow AAudio apps to use shared memory file descriptors from the HAL
+allow { appdomain -isolated_app } hal_audio:fd use;
+
# Allow app to access shared memory created by camera HAL1
allow { appdomain -isolated_app } hal_camera:fd use;
diff --git a/public/mediacodec.te b/public/mediacodec.te
index 5c1ccbf..771701c 100644
--- a/public/mediacodec.te
+++ b/public/mediacodec.te
@@ -8,10 +8,9 @@
# and use macro hal_server_domain
get_prop(mediacodec, hwservicemanager_prop)
-full_treble_only(`
- # on full-Treble devices, route all /dev/binder traffic to /dev/vndbinder
- vndbinder_use(mediacodec)
-')
+# can route /dev/binder traffic to /dev/vndbinder
+vndbinder_use(mediacodec)
+
not_full_treble(`
# on legacy devices, continue to allow /dev/binder traffic
binder_use(mediacodec)