Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: f070b51670

Change-Id: I5f229fc9d08e445c32ea8cf4e971129d79019cef
This commit is contained in:
Irina Dumitrescu
2019-03-08 14:16:35 -08:00
committed by android-build-merger
parent 8dada71897 f070b51670
commit 7bf37cf83d
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
keystore/java/android/security/KeyStore.java
View File

@@ -222,6 +222,15 @@ public class KeyStore {
}
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 @@ public class KeyStore {
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;
}