commit f070b51670c13ff8fb1d594b8bde4263bc6e13c1
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 08 21:58:46 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 08 21:58:46 2019 +0000
tree 5a4c30afb984f2b87e044779c9965d65b9dbe8d9
parent f899e268578453ae36aec158f238fc62580d7572
parent 203bd1b113a3998939005395f9fefe0a4798b1fb

Merge "Add Keystore get option that supresses caught exceptions warnings."

keystore/java/android/security/KeyStore.java

diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java
index 330d24d..6dfe1fd 100644
--- a/keystore/java/android/security/KeyStore.java
+++ b/keystore/java/android/security/KeyStore.java
@@ -222,6 +222,15 @@
     }
 
     public byte[] get(String key, int uid) {
+        return get(key, uid, false);
+    }
+
+    @UnsupportedAppUsage
+    public byte[] get(String key) {
+        return get(key, UID_SELF);
+    }
+
+    public byte[] get(String key, int uid, boolean suppressKeyNotFoundWarning) {
         try {
             key = key != null ? key : "";
             return mBinder.get(key, uid);
@@ -229,16 +238,18 @@
             Log.w(TAG, "Cannot connect to keystore", e);
             return null;
         } catch (android.os.ServiceSpecificException e) {
-            Log.w(TAG, "KeyStore exception", e);
+            if (!suppressKeyNotFoundWarning || e.errorCode != KEY_NOT_FOUND) {
+                Log.w(TAG, "KeyStore exception", e);
+            }
             return null;
         }
     }
 
-    @UnsupportedAppUsage
-    public byte[] get(String key) {
-        return get(key, UID_SELF);
+    public byte[] get(String key, boolean suppressKeyNotFoundWarning) {
+        return get(key, UID_SELF, suppressKeyNotFoundWarning);
     }
 
+
     public boolean put(String key, byte[] value, int uid, int flags) {
         return insert(key, value, uid, flags) == NO_ERROR;
     }