commit 587e72032a27a3001aa2b49c6d6d6d8e70afe09b
author Bill Yi <byi@google.com> Tue Jul 11 04:15:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 11 04:15:29 2017 +0000
tree b59cb84871bc4f5318a68062c4658968f50ae37d
parent d1d321e16c3b23c8f9b58c85c45144b8e4430dc5
parent c4f4ee429f47320c2589544708df574f71146b11

Import translations. DO NOT MERGE am: 74ac9a4812  -s ours
am: c4f4ee429f  -s ours

Change-Id: Id178390fc3a9012562ea24d9f2ddde49393b8f4f

src/com/android/keychain/KeyChainService.java

diff --git a/src/com/android/keychain/KeyChainService.java b/src/com/android/keychain/KeyChainService.java
index afdf272..a66ba91 100644
--- a/src/com/android/keychain/KeyChainService.java
+++ b/src/com/android/keychain/KeyChainService.java
@@ -104,15 +104,8 @@
             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(systemUidForUser);
-            sb.append('_');
-            sb.append(keystoreAlias);
-
-            return sb.toString();
+            return keystoreAlias;
         }
 
         @Override public byte[] getCertificate(String alias) {