commit 58c34c21c27c8c2fb7eca78e9322bfbb6cc44cc1
author Roshan Pius <rpius@google.com> Tue Nov 26 13:41:41 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 26 13:41:41 2019 -0800
tree f2ec9d9a0da7a4f83383e084ed8807440ff2c261
parent 9222cc684e7da51db4ba1466f46883c7ffe4ca9c
parent be24e3f39036035049cf84010dc376cdd0d1a1cd

Merge "Revert "keystore: Allow network_stack uid to use AID_WIFI""
am: be24e3f390

Change-Id: Iceeecd170c1b5069f6052b21a7591687c54cd18b

keystore/permissions.cpp

diff --git a/keystore/permissions.cpp b/keystore/permissions.cpp
index 3e81585..8b9e28d 100644
--- a/keystore/permissions.cpp
+++ b/keystore/permissions.cpp
@@ -55,12 +55,7 @@
 };
 
 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_FSVERITY_CERT, AID_ROOT},
                           {AID_FSVERITY_CERT, AID_SYSTEM},