| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-11-11 10:50:08 (GMT) |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-11 10:50:08 (GMT) |
| commit | 2c93b038f4c8ac484c89b79bbd78c3229a7ec9d3 (patch) | |
| tree | 60edc945f6a306546cc998e3e9a5b17d440d30bf | |
| parent | e30faa0f56848e2ec38e96482d3df933124ddbdf (diff) | |
| parent | bdb12601561697135caab6d5098dcea6a08f01f4 (diff) | |
| download | common-2c93b038f4c8ac484c89b79bbd78c3229a7ec9d3.zip common-2c93b038f4c8ac484c89b79bbd78c3229a7ec9d3.tar.gz common-2c93b038f4c8ac484c89b79bbd78c3229a7ec9d3.tar.bz2 | |
Merge changes from topic "dumpstate 1.1" into r-tv-dev am: bdb1260156
Original change: undetermined
Change-Id: I2e9c103aefacb11fd6d670b41b29ae0bd475882c
| -rw-r--r-- | core_amlogic.mk | 2 | ||||
| -rw-r--r-- | sepolicy/file_contexts | 2 | ||||
| -rw-r--r-- | sepolicy/hal_dumpstate_default.te | 3 | ||||
| -rw-r--r-- | sepolicy/property.te | 1 | ||||
| -rw-r--r-- | sepolicy/property_contexts | 1 |
5 files changed, 7 insertions, 2 deletions
diff --git a/core_amlogic.mk b/core_amlogic.mk index b55c79f..2c2208b 100644 --- a/core_amlogic.mk +++ b/core_amlogic.mk @@ -373,7 +373,7 @@ PRODUCT_PACKAGES += \ # dumpstate binderized PRODUCT_PACKAGES += \ - android.hardware.dumpstate@1.0-service.droidlogic + android.hardware.dumpstate@1.1-service.droidlogic # Keymaster HAL ifeq ($(TARGET_USE_HW_KEYMASTER),true) diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index e124da0..531c1f6 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -335,7 +335,7 @@ /(vendor|system/vendor)/usr/idc(/.*)? u:object_r:vendor_configs_file:s0 /vendor/bin/hw/android\.hardware\.health@2\.0-service.droidlogic u:object_r:hal_health_default_exec:s0 -/vendor/bin/hw/android\.hardware\.dumpstate@1\.0-service.droidlogic u:object_r:hal_dumpstate_default_exec:s0 +/vendor/bin/hw/android\.hardware\.dumpstate@1\.1-service.droidlogic u:object_r:hal_dumpstate_default_exec:s0 /vendor/bin/hw/android\.hardware\.drm@1\.3-service\.widevine u:object_r:hal_drm_default_exec:s0 /vendor/bin/hw/android\.hardware\.drm@1\.3-service\.clearkey u:object_r:hal_drm_clearkey_exec:s0 /vendor/bin/hw/android\.hardware\.power\.stats@1\.0-service\.mock u:object_r:hal_power_stats_default_exec:s0 diff --git a/sepolicy/hal_dumpstate_default.te b/sepolicy/hal_dumpstate_default.te index ee2e451..558c365 100644 --- a/sepolicy/hal_dumpstate_default.te +++ b/sepolicy/hal_dumpstate_default.te @@ -12,3 +12,6 @@ allow hal_dumpstate_default shell_data_file:file getattr; allow hal_dumpstate_default vendor_shell_exec:file rx_file_perms; allow hal_dumpstate_default vendor_toolbox_exec:file rx_file_perms; allow hal_dumpstate_default graphics_device:dir search; + +# Access to vendor logging property +set_prop(hal_dumpstate_default, vendor_logging_prop) diff --git a/sepolicy/property.te b/sepolicy/property.te index defb6c9..cb7cbb6 100644 --- a/sepolicy/property.te +++ b/sepolicy/property.te @@ -8,4 +8,5 @@ vendor_internal_prop(vendor_persist_prop) vendor_restricted_prop(vendor_app_prop) vendor_internal_prop(vendor_wifi_prop) vendor_internal_prop(oem_prop) +vendor_internal_prop(vendor_logging_prop) diff --git a/sepolicy/property_contexts b/sepolicy/property_contexts index 1616329..32fb311 100644 --- a/sepolicy/property_contexts +++ b/sepolicy/property_contexts @@ -25,4 +25,5 @@ ro.boot.oem. u:object_r:oem_prop:s0 vendor.allm.support u:object_r:media_prop:s0 vendor.contenttype_game.support u:object_r:media_prop:s0 +persist.vendor.verbose_logging. u:object_r:vendor_logging_prop:s0 |