diff options
| author | Inseob Kim <inseob@google.com> | 2020-06-19 04:37:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-19 04:37:57 +0000 |
| commit | 2532dd7198c12c041107c9928d474d9e0771edd2 (patch) | |
| tree | 3a5b524a4a0390e9a3204d43a3e4b60b8f0ea357 | |
| parent | 4bf8ac6e4f14decb727c5a47c4b1b57bd95840ad (diff) | |
| parent | 76c0bf871fcfe4a4f283d9116d6421807698e064 (diff) | |
| download | crosshatch-sepolicy-2532dd7198c12c041107c9928d474d9e0771edd2.tar.gz | |
Merge "Solve the naming problem for vendor property" into rvc-dev am: 76c0bf871fandroid-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/crosshatch-sepolicy/+/11881951
Change-Id: I842f47ad69dc515afe3d9a25c80bdf6c4ae0e0c1
| -rw-r--r-- | vendor/google/property_contexts | 1 | ||||
| -rw-r--r-- | vendor/qcom/common/vendor_init.te | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/vendor/google/property_contexts b/vendor/google/property_contexts index d9af5c4..be45d93 100644 --- a/vendor/google/property_contexts +++ b/vendor/google/property_contexts @@ -9,7 +9,6 @@ persist.vendor.mdm. u:object_r:vendor_modem_prop:s0 # ramoops vendor.ramoops. u:object_r:vendor_ramoops_prop:s0 -vendor.powerhal.rendering u:object_r:power_prop:s0 persist.vendor.radio.no_wait_for_card u:object_r:vendor_radio_prop:s0 persist.vendor.shutdown. u:object_r:vendor_shutdown_prop:s0 persist.vendor.radio.multisim_switch_support u:object_r:vendor_radio_prop:s0 diff --git a/vendor/qcom/common/vendor_init.te b/vendor/qcom/common/vendor_init.te index 6ffbd7c..4590949 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) |