summaryrefslogtreecommitdiffstats
path: root/cmds/keystore
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2011-06-30 22:58:29 -0700
committerBrian Carlstrom <bdc@google.com>2011-06-30 22:59:13 -0700
commitf4b92ec567477fcdea24fdd18116b045dfcf9852 (patch)
tree196f3192cd08f076c1636ec2f91b3eb5e2dc4683 /cmds/keystore
parentce43bc48588408e72aaa47ac1483837d5bfd1f59 (diff)
downloadframeworks_base-f4b92ec567477fcdea24fdd18116b045dfcf9852.zip
frameworks_base-f4b92ec567477fcdea24fdd18116b045dfcf9852.tar.gz
frameworks_base-f4b92ec567477fcdea24fdd18116b045dfcf9852.tar.bz2
Revert "Add keychain user with special keystore access permissions"
This reverts commit 8c2a1a90a81f04573bfa578eab32f5fd4a30eafb. Conflicts: cmds/keystore/keystore.c Bug:4970237 Change-Id: I626023d695becfada47e5f319b18e0889b766563
Diffstat (limited to 'cmds/keystore')
-rw-r--r--cmds/keystore/keystore.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/cmds/keystore/keystore.cpp b/cmds/keystore/keystore.cpp
index 1c1f37a..4b4b9b9 100644
--- a/cmds/keystore/keystore.cpp
+++ b/cmds/keystore/keystore.cpp
@@ -712,7 +712,6 @@ static struct user {
{AID_VPN, AID_SYSTEM, GET},
{AID_WIFI, AID_SYSTEM, GET},
{AID_ROOT, AID_SYSTEM, GET},
- {AID_KEYCHAIN, AID_SYSTEM, TEST | GET | SAW},
{~0, ~0, TEST | GET | INSERT | DELETE | EXIST | SAW},
};