| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-20 21:44:53 (GMT) |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2020-08-20 21:44:53 (GMT) |
| commit | 62ef2dbf9511a21021b5ac68b27492c2878e65eb (patch) | |
| tree | 0cbebafc176c0e2462f114ce8507c31e89d4cf04 | |
| parent | 887b3a4172de5d8ade478ac0c61c6312c901f350 (diff) | |
| parent | b69e8e500ddf0bf290ec11429a971781edcfba83 (diff) | |
| download | common-62ef2dbf9511a21021b5ac68b27492c2878e65eb.zip common-62ef2dbf9511a21021b5ac68b27492c2878e65eb.tar.gz common-62ef2dbf9511a21021b5ac68b27492c2878e65eb.tar.bz2 | |
Merge "Revert "Cherrypick atv_prop to fix broken sepolicy"" into q-tv-r1-dev
| -rwxr-xr-x | sepolicy/priv_app.te | 1 | ||||
| -rwxr-xr-x | sepolicy/property.te | 2 | ||||
| -rwxr-xr-x | sepolicy/property_contexts | 3 | ||||
| -rw-r--r-- | sepolicy/vendor_init.te | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/sepolicy/priv_app.te b/sepolicy/priv_app.te index c5e6b97..d29b1e6 100755 --- a/sepolicy/priv_app.te +++ b/sepolicy/priv_app.te @@ -29,4 +29,3 @@ 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 11b3ef0..2ff4c21 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 5b206ce..0e64fae 100755 --- a/sepolicy/property_contexts +++ b/sepolicy/property_contexts @@ -22,8 +22,7 @@ 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 86a5e7a..250f071 100644 --- a/sepolicy/vendor_init.te +++ b/sepolicy/vendor_init.te @@ -43,6 +43,5 @@ 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 }; |