summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAjay Dudani <adudani@google.com>2017-12-01 09:57:11 -0800
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-01-26 19:14:02 +0000
commitf6b6de8c37e55044bb316899693bca82bae14dc6 (patch)
tree8d7260dfa9b1dae19eea2a5acd00ea88d97020be
parent8261249c494995881a0ac00abc0885320538554a (diff)
downloaddevice_google_wahoo-f6b6de8c37e55044bb316899693bca82bae14dc6.tar.gz
device_google_wahoo-f6b6de8c37e55044bb316899693bca82bae14dc6.tar.bz2
device_google_wahoo-f6b6de8c37e55044bb316899693bca82bae14dc6.zip
sepolicy: Allow rpm and wifi power stats in user builds [DO NOT MERGE]
In order to enable debugging of power issues on 'user' builds, we need to capture rpm stats and wifi power stats from debugfs. Allow this for user builds. Bug: 69003183 Test: Verify rpm & wifi power stats are present in bugreport Change-Id: If9754137f9331832d055ee39d3fd3d5ec79cfc15 (cherry picked from commit 00d46c1e0037510cb12bfccd254ca8b8aebf5485)
-rw-r--r--sepolicy/vendor/hal_power_default.te3
-rw-r--r--sepolicy/vendor/kernel.te3
2 files changed, 2 insertions, 4 deletions
diff --git a/sepolicy/vendor/hal_power_default.te b/sepolicy/vendor/hal_power_default.te
index aa92c358..b588634b 100644
--- a/sepolicy/vendor/hal_power_default.te
+++ b/sepolicy/vendor/hal_power_default.te
@@ -4,10 +4,7 @@ allow hal_power_default perfd_socket:sock_file write;
allow hal_power_default sysfs_graphics:dir search;
allow hal_power_default sysfs_graphics:file r_file_perms;
-userdebug_or_eng(`
-# debugfs entries are only needed in user-debug or eng builds
allow hal_power_default debugfs_rpm:file r_file_perms;
allow hal_power_default debugfs_wlan:dir r_dir_perms;
allow hal_power_default debugfs_wlan:file r_file_perms;
-')
diff --git a/sepolicy/vendor/kernel.te b/sepolicy/vendor/kernel.te
index 23686463..d2bf9c0f 100644
--- a/sepolicy/vendor/kernel.te
+++ b/sepolicy/vendor/kernel.te
@@ -1,7 +1,6 @@
# for diag over socket
userdebug_or_eng(`
allow kernel self:socket create;
- allow kernel debugfs_wlan:dir search;
')
allow kernel vendor_firmware_file:dir search;
@@ -12,3 +11,5 @@ dontaudit kernel kernel:system module_request;
allow kernel debugfs_ipc:dir search;
allow kernel persist_file:dir search;
+
+allow kernel debugfs_wlan:dir search;