diff options
author | Amit Mahajan <amitmahajan@google.com> | 2014-10-16 10:24:43 -0700 |
---|---|---|
committer | Amit Mahajan <amitmahajan@google.com> | 2014-10-16 10:24:43 -0700 |
commit | 0e25779e159f28cea77e971bcc9c9c6ed666bfda (patch) | |
tree | 938c9328077a11620e200faf118e5f5780554d8c /sepolicy/file_contexts | |
parent | b43bf5ffffdcf4a965798f0454a13c299175de57 (diff) | |
parent | fe168d1b0b8e667c98bfa7435ac64fd25b5bff87 (diff) | |
download | shamu-0e25779e159f28cea77e971bcc9c9c6ed666bfda.tar.gz |
resolved conflicts for merge of fe168d1b to lmp-mr1-dev
Change-Id: Ieb97ac2fbf5161bd93a73dfc1cd8f0978b444371
Diffstat (limited to 'sepolicy/file_contexts')
-rw-r--r-- | sepolicy/file_contexts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 82e23de3..f985355b 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -110,6 +110,7 @@ /persist/data/sfs(/.*)? u:object_r:persist_drm_file:s0 /persist/sensors(/.*)? u:object_r:persist_sensors_file:s0 /persist/mdm(/.*)? u:object_r:persist_modem_file:s0 +/persist/public/hiddenmenu(/.*)? u:object_r:persist_hiddenmenu_file:s0 #/system binaries /system/bin/adspd u:object_r:adspd_exec:s0 |