summaryrefslogtreecommitdiff
authorPowei Feng <powei@google.com>2019-04-29 18:52:27 (GMT)
committer Robin Lee <rgl@google.com>2020-08-04 00:47:02 (GMT)
commit26784f53142b14c8aaa49f28bd5630f3a6092304 (patch)
tree96a7063ed27f569fcaa3fd8263f7e4e14499b723
parent6d57522f43a9ff45dbf3ce775255000b77eab465 (diff)
downloadcommon-26784f53142b14c8aaa49f28bd5630f3a6092304.zip
common-26784f53142b14c8aaa49f28bd5630f3a6092304.tar.gz
common-26784f53142b14c8aaa49f28bd5630f3a6092304.tar.bz2
Cherrypick atv_prop to fix broken sepolicy
In Ice40da0eca8d8d3a050df3f27fee6b003a0e06da this was only done for P. All Q devices fail to set this property and so remote pairing is not shown when the GSI is flashed. Longterm solution is to rename this property to something more appropriate as suggested in b/129009263 atthe time. Test: adb shell getprop atv.setup.bt_remote_pairing Change-Id: Ia2d9c90bd261424bc7561ba8ef2e698df3a789b3
Diffstat
-rwxr-xr-xsepolicy/priv_app.te1
-rwxr-xr-xsepolicy/property.te2
-rwxr-xr-xsepolicy/property_contexts3
-rw-r--r--sepolicy/vendor_init.te1
4 files changed, 5 insertions, 2 deletions
diff --git a/sepolicy/priv_app.te b/sepolicy/priv_app.te
index d29b1e6..c5e6b97 100755
--- a/sepolicy/priv_app.te
+++ b/sepolicy/priv_app.te
@@ -29,3 +29,4 @@ allow priv_app debugfs_mali:dir search;
allow priv_app storage_stub_file:dir { getattr };
get_prop(priv_app, netflix_prop)
+get_prop(priv_app, vendor_atv_prop)
diff --git a/sepolicy/property.te b/sepolicy/property.te
index 2ff4c21..11b3ef0 100755
--- a/sepolicy/property.te
+++ b/sepolicy/property.te
@@ -7,5 +7,5 @@ type vendor_platform_prop, property_type;
type vendor_persist_prop, property_type;
type vendor_app_prop, property_type;
type vendor_wifi_prop, property_type;
+type vendor_atv_prop, property_type;
type oem_prop, property_type;
-
diff --git a/sepolicy/property_contexts b/sepolicy/property_contexts
index 0e64fae..5b206ce 100755
--- a/sepolicy/property_contexts
+++ b/sepolicy/property_contexts
@@ -22,7 +22,8 @@ vendor.sys u:object_r:vendor_platform_prop:s0
ro.vendor.app u:object_r:vendor_app_prop:s0
vendor.wlan u:object_r:vendor_wifi_prop:s0
ro.boot.oem. u:object_r:oem_prop:s0
+ro.com.google.gmsversion u:object_r:vendor_atv_prop:s0
+atv. u:object_r:vendor_atv_prop:s0
vendor.allm.support u:object_r:media_prop:s0
vendor.contenttype_game.support u:object_r:media_prop:s0
-
diff --git a/sepolicy/vendor_init.te b/sepolicy/vendor_init.te
index 250f071..86a5e7a 100644
--- a/sepolicy/vendor_init.te
+++ b/sepolicy/vendor_init.te
@@ -43,5 +43,6 @@ set_prop(vendor_init, oem_prop)
set_prop(vendor_init, exported_default_prop)
set_prop(vendor_init, system_prop)
set_prop(vendor_init, vendor_persist_prop)
+set_prop(vendor_init, vendor_atv_prop)
allow vendor_init vendor_persist_prop:property_service {set};
allow vendor_init tee_vendor_file:dir { create relabelto };