diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-06-30 22:58:29 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2011-06-30 22:59:13 -0700 |
| commit | f4b92ec567477fcdea24fdd18116b045dfcf9852 (patch) | |
| tree | 196f3192cd08f076c1636ec2f91b3eb5e2dc4683 /services | |
| parent | ce43bc48588408e72aaa47ac1483837d5bfd1f59 (diff) | |
| download | frameworks_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 'services')
| -rw-r--r-- | services/java/com/android/server/pm/PackageManagerService.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index 22e2dde..ea5d26b 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -157,7 +157,6 @@ public class PackageManagerService extends IPackageManager.Stub { private static final int RADIO_UID = Process.PHONE_UID; private static final int LOG_UID = Process.LOG_UID; private static final int NFC_UID = Process.NFC_UID; - private static final int KEYCHAIN_UID = Process.KEYCHAIN_UID; static final int FIRST_APPLICATION_UID = Process.FIRST_APPLICATION_UID; static final int MAX_APPLICATION_UIDS = 1000; @@ -761,10 +760,6 @@ public class PackageManagerService extends IPackageManager.Stub { MULTIPLE_APPLICATION_UIDS ? NFC_UID : FIRST_APPLICATION_UID, ApplicationInfo.FLAG_SYSTEM); - mSettings.addSharedUserLPw("android.uid.keychain", - MULTIPLE_APPLICATION_UIDS - ? KEYCHAIN_UID : FIRST_APPLICATION_UID, - ApplicationInfo.FLAG_SYSTEM); String separateProcesses = SystemProperties.get("debug.separate_processes"); if (separateProcesses != null && separateProcesses.length() > 0) { |