summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInseob Kim <inseob@google.com>2020-06-19 04:37:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-19 04:37:56 +0000
commit2a8682735c5b871513a2069fb24e3574ca585af7 (patch)
tree84eec21e5cf11373c02ceef284b2aeef9d0c4cc0
parent6e6aa430f7395a5fb8e26fc84645dca1a3a18564 (diff)
parent1fbf5a98a54f1c8c81df4c3aaf6e6eec60f5cbb5 (diff)
downloadbonito-sepolicy-android11-mainline-media-swcodec-release.tar.gz
Merge "Solve the naming problem for vendor property" into rvc-dev am: 1fbf5a98a5android-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseaml_tz2_305400100
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito-sepolicy/+/11886082 Change-Id: Ia4e840e21b6b4a2f9f479a9c795e2f0c4dc1d184
-rw-r--r--vendor/google/property_contexts1
-rw-r--r--vendor/qcom/common/vendor_init.te2
2 files changed, 1 insertions, 2 deletions
diff --git a/vendor/google/property_contexts b/vendor/google/property_contexts
index d8208f6d..1d900d15 100644
--- a/vendor/google/property_contexts
+++ b/vendor/google/property_contexts
@@ -2,7 +2,6 @@
vendor.ramoops. u:object_r:vendor_ramoops_prop:s0
persist.vendor.radio.no_wait_for_card u:object_r:vendor_radio_prop:s0
-vendor.powerhal.rendering u:object_r:power_prop:s0
persist.vendor.shutdown. u:object_r:vendor_shutdown_prop:s0
# haptics
diff --git a/vendor/qcom/common/vendor_init.te b/vendor/qcom/common/vendor_init.te
index 3e2de3d2..e5c5bbe2 100644
--- a/vendor/qcom/common/vendor_init.te
+++ b/vendor/qcom/common/vendor_init.te
@@ -15,7 +15,7 @@ userdebug_or_eng(`
')
set_prop(vendor_init, vendor_camera_prop)
-set_prop(vendor_init, power_prop)
+set_prop(vendor_init, vendor_power_prop)
set_prop(vendor_init, public_vendor_default_prop)
set_prop(vendor_init, vendor_bluetooth_prop)
set_prop(vendor_init, vendor_modem_diag_prop)