summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2019-10-09 19:12:15 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-10-09 19:12:15 +0000
commit9ff0edfe2688f8813c5c0f91a3004d5e5b210df4 (patch)
treef6d0482a977447fbf12a1a7f90db660c366089bd
parenta5273d9a57f33c7760e65119f82cad86a8cdd29c (diff)
parent286c4b053266d77f94fda03320fd2c93ceb20125 (diff)
downloadsecurity-9ff0edfe2688f8813c5c0f91a3004d5e5b210df4.tar.gz
Merge "keystore: Allow network_stack uid to use AID_WIFI"ndk-sysroot-r21
-rw-r--r--keystore/permissions.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/keystore/permissions.cpp b/keystore/permissions.cpp
index d17fcddd..9630c317 100644
--- a/keystore/permissions.cpp
+++ b/keystore/permissions.cpp
@@ -55,7 +55,12 @@ struct user_euid {
};
user_euid user_euids[] = {{AID_VPN, AID_SYSTEM},
+ // Wifi services will run in system_server on devices not using wifi
+ // mainline module.
{AID_WIFI, AID_SYSTEM},
+ // Wifi services will run in network_stack on devices using wifi mainline
+ // module.
+ {AID_WIFI, AID_NETWORK_STACK},
{AID_ROOT, AID_SYSTEM},
{AID_WIFI, AID_KEYSTORE},
{AID_KEYSTORE, AID_WIFI},