[DO NOT MERGE] Revert "Grant VTS tests all permissions in keystore on userdebug/eng"
Bug:117993149
This reverts commit cfe00de661cedfad6295fc8713a5da3b48031cb2.
Reason for revert: removing this from May QPR & pi-dev.
Change-Id: Id3d5381cedcbbb47a1014bdf521e1a1083aa2724
(cherry picked from commit e7a4f584dfb8558ab22e5e7620f00f515f04c4e0)
diff --git a/keystore/Android.bp b/keystore/Android.bp
index 8d095e1..9ce00c2 100644
--- a/keystore/Android.bp
+++ b/keystore/Android.bp
@@ -76,13 +76,6 @@
pdk: {
enabled: false,
},
- debuggable: {
- cflags: [
- // Allow VTS tests running as root to have
- // additional permissions.
- "-DGRANT_ROOT_ALL_PERMISSIONS",
- ],
- },
},
required: ["keystore_cli_v2"],
diff --git a/keystore/permissions.cpp b/keystore/permissions.cpp
index b297c59..c86a02a 100644
--- a/keystore/permissions.cpp
+++ b/keystore/permissions.cpp
@@ -69,13 +69,7 @@
{AID_VPN, static_cast<perm_t>(P_GET | P_SIGN | P_VERIFY)},
{AID_WIFI, static_cast<perm_t>(P_GET | P_SIGN | P_VERIFY)},
{AID_BLUETOOTH, static_cast<perm_t>(P_GET | P_INSERT | P_DELETE | P_EXIST | P_SIGN | P_VERIFY)},
-
-#ifdef GRANT_ROOT_ALL_PERMISSIONS
- // Allow VTS tests running as root to perform all operations
- {AID_ROOT, static_cast<perm_t>((uint32_t)(~0))},
-#else
{AID_ROOT, static_cast<perm_t>(P_GET)},
-#endif
};
static const perm_t DEFAULT_PERMS = static_cast<perm_t>(