commit 64aa1b585a009190f14b1acc3a167843b1a8b096
author Roshan Pius <rpius@google.com> Wed Oct 09 12:35:33 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 09 12:35:33 2019 -0700
tree f6d0482a977447fbf12a1a7f90db660c366089bd
parent 9666e63017f0eff1a1f4c2201a133457624b565f
parent 9ff0edfe2688f8813c5c0f91a3004d5e5b210df4

Merge "keystore: Allow network_stack uid to use AID_WIFI"
am: 9ff0edfe26

Change-Id: I96def81436ee5cfdf14bbc46c18154667be7ffe0

keystore/permissions.cpp

diff --git a/keystore/permissions.cpp b/keystore/permissions.cpp
index d17fcdd..9630c31 100644
--- a/keystore/permissions.cpp
+++ b/keystore/permissions.cpp
@@ -55,7 +55,12 @@
 };
 
 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},