summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-10-27 14:50:08 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-10-27 14:50:08 +0000
commitf5889c6e4475d3d35784b449310463d7b8713200 (patch)
treed46fa6d8a39b32dddb922d6ddd66ff980eea6333
parent27336fa38840b8fa82183cf486c5c38fe9f64800 (diff)
parentf2681f42640fbb21ec63490014cc30ee81af5128 (diff)
downloaddevice_google_wahoo-f5889c6e4475d3d35784b449310463d7b8713200.tar.gz
device_google_wahoo-f5889c6e4475d3d35784b449310463d7b8713200.tar.bz2
device_google_wahoo-f5889c6e4475d3d35784b449310463d7b8713200.zip
Merge cherrypicks of [3134552, 3130583, 3131953, 3131954, 3131955, 3131956, 3131957, 3131958, 3131959, 3132062, 3132336, 3131074, 3133939, 3131024, 3131025, 3131026, 3130584, 3130879, 3130880] into oc-mr1-release
Change-Id: Id3a9e9072295d375ada014c96c690b83e2b83496
-rw-r--r--sepolicy/vendor/system_app.te5
1 files changed, 2 insertions, 3 deletions
diff --git a/sepolicy/vendor/system_app.te b/sepolicy/vendor/system_app.te
index 72d8cf3b..1cc6fb1f 100644
--- a/sepolicy/vendor/system_app.te
+++ b/sepolicy/vendor/system_app.te
@@ -2,9 +2,8 @@
# userdebug and eng devices
userdebug_or_eng(`set_prop(system_app, tel_mon_prop)')
-# Needed by Settings app's CameraHalHdrplusPreferenceController, available only on a subset of
-# userdebug and eng devices
-userdebug_or_eng(`set_prop(system_app, camera_prop)')
+# Needed by Settings app's CameraHalHdrplusPreferenceController
+set_prop(system_app, camera_prop)
# read regulatory info
allow system_app elabel_data_file:dir r_dir_perms;