summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiddharth Kapoor <ksiddharth@google.com>2022-04-07 04:23:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-07 04:23:37 +0000
commit466c441e8b8cbab76d32432bee6c5f20811029fd (patch)
tree3a97fd86bd047d8b4225e3189522ac365818e7ab
parentfad23ad3fd8d2211f716c37469273a605dd9958a (diff)
parent0ce9204b3d1def522717ab5d6d7bc7d90a5c251b (diff)
downloadpixel-sepolicy-466c441e8b8cbab76d32432bee6c5f20811029fd.tar.gz
Merge "Revert "Move ODPM file rule to pixel sepolicy"" into tm-dev am: 0ce9204b3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/pixel-sepolicy/+/17609197 Change-Id: I5f14323a0478ef30d031155b3edc2135a3eb1ca1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--common/vendor/file.te3
-rw-r--r--powerstats/hal_power_stats_default.te2
-rw-r--r--thermal/hal_thermal_default.te1
3 files changed, 0 insertions, 6 deletions
diff --git a/common/vendor/file.te b/common/vendor/file.te
index 731c205..8fb41bc 100644
--- a/common/vendor/file.te
+++ b/common/vendor/file.te
@@ -1,5 +1,2 @@
type persist_file, file_type, vendor_persist_type;
type sysfs_iio_devices, fs_type, sysfs_type;
-
-# ODPM
-type sysfs_odpm, sysfs_type, fs_type; \ No newline at end of file
diff --git a/powerstats/hal_power_stats_default.te b/powerstats/hal_power_stats_default.te
index a3ee625..b125ef7 100644
--- a/powerstats/hal_power_stats_default.te
+++ b/powerstats/hal_power_stats_default.te
@@ -6,5 +6,3 @@ add_service(hal_power_stats_server, hal_power_stats_service)
r_dir_file(hal_power_stats_default, sysfs_power_stats)
allow hal_power_stats_default power_stats_device:chr_file rw_file_perms;
-allow hal_power_stats_default sysfs_odpm:dir search;
-allow hal_power_stats_default sysfs_odpm:file rw_file_perms; \ No newline at end of file
diff --git a/thermal/hal_thermal_default.te b/thermal/hal_thermal_default.te
index 1510b74..2498b20 100644
--- a/thermal/hal_thermal_default.te
+++ b/thermal/hal_thermal_default.te
@@ -5,7 +5,6 @@ allow hal_thermal_default thermal_link_device:dir r_dir_perms;
allow hal_thermal_default proc_stat:file r_file_perms;
allow hal_thermal_default self:netlink_generic_socket create_socket_perms_no_ioctl;
allow hal_thermal_default self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
-allow hal_thermal_default sysfs_odpm:file r_file_perms;
hal_client_domain(hal_thermal_default, hal_power);