summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-06 22:52:08 +0000
committerXin Li <delphij@google.com>2021-10-06 22:52:08 +0000
commitad1cb334e64eb6455e87c856d212607d8cea646f (patch)
treee78b745fc37b351b4ce7356181f967d9e35dd8b0
parent1842e0ee76a0b162a953d117e2d36e4a45077645 (diff)
parent880a3095fe64f621da49776ebd458d30b2283c8f (diff)
downloadbarbet-sepolicy-ad1cb334e64eb6455e87c856d212607d8cea646f.tar.gz
Merge Android 12
Bug: 202323961 Merged-In: Ifa23f1acbb803e69b6a9cf08acdeaf442874a63c Change-Id: I723008e3766cee46ee0697ffad74e51602de03e2
-rw-r--r--OWNERS1
-rw-r--r--tracking_denials/hal_dumpstate_impl.te2
-rw-r--r--tracking_denials/incidentd.te2
-rw-r--r--tracking_denials/pixelstats_vendor.te2
-rw-r--r--tracking_denials/proc_net.te2
-rw-r--r--vendor/google/bug_map2
-rw-r--r--vendor/google/file_contexts2
-rw-r--r--vendor/google/pixelstats_vendor.te2
8 files changed, 11 insertions, 4 deletions
diff --git a/OWNERS b/OWNERS
index c133e99..f54e337 100644
--- a/OWNERS
+++ b/OWNERS
@@ -9,5 +9,4 @@ nnk@google.com
rurumihong@google.com
smoreland@google.com
sspatil@google.com
-tomcherry@google.com
trong@google.com
diff --git a/tracking_denials/hal_dumpstate_impl.te b/tracking_denials/hal_dumpstate_impl.te
new file mode 100644
index 0000000..8fa3265
--- /dev/null
+++ b/tracking_denials/hal_dumpstate_impl.te
@@ -0,0 +1,2 @@
+# b/193476528
+dontaudit hal_dumpstate_impl sysfs:file getattr;
diff --git a/tracking_denials/incidentd.te b/tracking_denials/incidentd.te
new file mode 100644
index 0000000..87a9e93
--- /dev/null
+++ b/tracking_denials/incidentd.te
@@ -0,0 +1,2 @@
+# b/187011252
+dontaudit incidentd apex_info_file:file getattr;
diff --git a/tracking_denials/pixelstats_vendor.te b/tracking_denials/pixelstats_vendor.te
new file mode 100644
index 0000000..0f6e3a3
--- /dev/null
+++ b/tracking_denials/pixelstats_vendor.te
@@ -0,0 +1,2 @@
+# b/182338901
+dontaudit pixelstats_vendor servicemanager:binder call;
diff --git a/tracking_denials/proc_net.te b/tracking_denials/proc_net.te
deleted file mode 100644
index 74a9ba8..0000000
--- a/tracking_denials/proc_net.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# b/170265025
-dontaudit proc_net proc:filesystem associate ;
diff --git a/vendor/google/bug_map b/vendor/google/bug_map
new file mode 100644
index 0000000..5d513f3
--- /dev/null
+++ b/vendor/google/bug_map
@@ -0,0 +1,2 @@
+vendor_init gsid_prop file b/181724180
+
diff --git a/vendor/google/file_contexts b/vendor/google/file_contexts
index ea10191..cdb877d 100644
--- a/vendor/google/file_contexts
+++ b/vendor/google/file_contexts
@@ -1,4 +1,4 @@
# vendor binaries
-/vendor/bin/hw/android\.hardware\.usb@1\.2-service\.barbet u:object_r:hal_usb_impl_exec:s0
+/vendor/bin/hw/android\.hardware\.usb@1\.3-service\.barbet u:object_r:hal_usb_impl_exec:s0
/vendor/bin/hw/android\.hardware\.vibrator-service\.barbet u:object_r:hal_vibrator_default_exec:s0
/vendor/bin/hw/android\.hardware\.dumpstate@1\.1-service\.barbet u:object_r:hal_dumpstate_impl_exec:s0
diff --git a/vendor/google/pixelstats_vendor.te b/vendor/google/pixelstats_vendor.te
index 4522965..7ce355b 100644
--- a/vendor/google/pixelstats_vendor.te
+++ b/vendor/google/pixelstats_vendor.te
@@ -25,3 +25,5 @@ allow pixelstats_vendor sysfs_wlc:dir search;
# OrientationCollector
allow pixelstats_vendor fwk_sensor_hwservice:hwservice_manager find;
binder_call(pixelstats_vendor, system_server)
+binder_use(pixelstats_vendor)
+allow pixelstats_vendor fwk_stats_service:service_manager find;