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

Add Keystore get option that supresses caught exceptions warnings.

Browse Source 
This is useful when the caught exceptions are not informative and they
act as a red herring in the adb logs.

Bug:109791294
Test: call this method in the VpnSettings and manually navigate to
adding a new VPN by searching for VPN in settings and then pressing '+'.

Change-Id: I4bc86e3ea5b11027090fd3a27dc7455557cf66ab
This commit is contained in:
Irina Dumitrescu
2018-06-08 19:36:34 +01:00
parent 70b447a378
commit 4a1cccc938
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,22 +190,33 @@ public class KeyStore {
}
public byte[] get(String key, int uid) {
try {
key = key != null ? key : "";
return mBinder.get(key, uid);
} catch (RemoteException e) {
Log.w(TAG, "Cannot connect to keystore", e);
return null;
} catch (android.os.ServiceSpecificException e) {
Log.w(TAG, "KeyStore exception", e);
return null;
}
return get(key, uid, false);
}
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);
} catch (RemoteException e) {
Log.w(TAG, "Cannot connect to keystore", e);
return null;
} catch (android.os.ServiceSpecificException e) {
if (!suppressKeyNotFoundWarning || e.errorCode != KEY_NOT_FOUND) {
Log.w(TAG, "KeyStore exception", e);
}
return null;
}
}
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;
}