commit 6ac568d4ab8ff54a67c7fb362ec201466b7ab843
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Sep 11 22:22:59 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 11 22:22:59 2023 +0000
tree 91a5c7f8a3cbc364a022aec1dd647e7ada251bfe
parent e32751f7487335eb98cfcbeb3afd34baf9fdb461
parent 5717c080c811589290ebd03128b63e1cd27a95b3

Merge "Add device_config read access to priv_app" into main

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 37b6171..9929c24 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -38,13 +38,6 @@
 }
 
 filegroup {
-  name: "com.android.threadnetwork-file_contexts",
-  srcs: [
-    "com.android.threadnetwork-file_contexts",
-  ],
-}
-
-filegroup {
   name: "com.android.sdkext-file_contexts",
   srcs: [
     "com.android.sdkext-file_contexts",

apex/com.android.tethering-file_contexts

diff --git a/apex/com.android.tethering-file_contexts b/apex/com.android.tethering-file_contexts
index af366d8..53843ea 100644
--- a/apex/com.android.tethering-file_contexts
+++ b/apex/com.android.tethering-file_contexts
@@ -1,3 +1,4 @@
 (/.*)?                  u:object_r:system_file:s0
 /bin/for-system/clatd   u:object_r:clatd_exec:s0
+/bin/ot-daemon          u:object_r:ot_daemon_exec:s0
 /lib(64)?(/.*)          u:object_r:system_lib_file:s0

apex/com.android.threadnetwork-file_contexts

diff --git a/apex/com.android.threadnetwork-file_contexts b/apex/com.android.threadnetwork-file_contexts
deleted file mode 100644
index 3264177..0000000
--- a/apex/com.android.threadnetwork-file_contexts
+++ /dev/null
@@ -1,2 +0,0 @@
-(/.*)?                         u:object_r:system_file:s0
-/bin/ot-daemon                 u:object_r:ot_daemon_exec:s0