commit 24205050056f3c0394983452bab962537672e74e
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 14 19:08:49 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 14 19:08:49 2017 +0000
tree 36e27a9a20a7fc29e5399f8c352c694587a61301
parent 864bcb1246e4d7620eeb9a81f4b3356b504a4d3a
parent c394aeac1097fcc75a80fb62db3bb0d9b566dea4

Merge "Refurbish granting mechanism"

src/com/android/keychain/KeyChainService.java

diff --git a/src/com/android/keychain/KeyChainService.java b/src/com/android/keychain/KeyChainService.java
index a66ba91..f45a1e6 100644
--- a/src/com/android/keychain/KeyChainService.java
+++ b/src/com/android/keychain/KeyChainService.java
@@ -101,11 +101,7 @@
 
             final String keystoreAlias = Credentials.USER_PRIVATE_KEY + alias;
             final int uid = Binder.getCallingUid();
-            if (!mKeyStore.grant(keystoreAlias, uid)) {
-                return null;
-            }
-
-            return keystoreAlias;
+            return mKeyStore.grant(keystoreAlias, uid);
         }
 
         @Override public byte[] getCertificate(String alias) {