commit 0a779207d5f937ebc4ddc0ff3827bc03b7d674f8
author Robin Lee <rgl@google.com> Tue Sep 02 17:45:49 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 02 17:45:49 2014 +0000
tree 5a6c604ffc61b19dc24794a3743724211c565cdf
parent 53053f6a61febe3aa000befa82bd74bf76e2a0c0
parent 820e040dc991e8fa60a5eccf1922b8635f086728

am 820e040d: am b110a189: am 93772c3b: Tag keystore aliases with user-specific SYSTEM_UID

* commit '820e040dc991e8fa60a5eccf1922b8635f086728':
  Tag keystore aliases with user-specific SYSTEM_UID

src/com/android/keychain/KeyChainService.java

diff --git a/src/com/android/keychain/KeyChainService.java b/src/com/android/keychain/KeyChainService.java
index 2024c26..091475a 100644
--- a/src/com/android/keychain/KeyChainService.java
+++ b/src/com/android/keychain/KeyChainService.java
@@ -28,6 +28,7 @@
 import android.os.Binder;
 import android.os.IBinder;
 import android.os.Process;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.security.Credentials;
 import android.security.IKeyChainService;
@@ -94,9 +95,11 @@
             if (!mKeyStore.grant(keystoreAlias, uid)) {
                 return null;
             }
+            final int userHandle = UserHandle.getUserId(uid);
+            final int systemUidForUser = UserHandle.getUid(userHandle, Process.SYSTEM_UID);
 
             final StringBuilder sb = new StringBuilder();
-            sb.append(Process.SYSTEM_UID);
+            sb.append(systemUidForUser);
             sb.append('_');
             sb.append(keystoreAlias);