Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 203bd1b1 authored by Irina Dumitrescu's avatar Irina Dumitrescu Committed by Max Bires
Browse files

Add Keystore get option that supresses caught exceptions warnings. 

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
Merged-In: I4bc86e3ea5b11027090fd3a27dc7455557cf66ab
parent 18cccec6

keystore/java/android/security/KeyStore.java

+15 −4
Original line number Diff line number Diff line
@@ -219,6 +219,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);
@@ -226,16 +235,18 @@ public class KeyStore { 
            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;

        }

    }



    @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;

    }