diff options
| author | Janis Danisevskis <jdanis@google.com> | 2021-02-26 03:04:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-26 03:04:30 +0000 |
| commit | a51a74a8c58736d9af6be1006f08f99c64f255ad (patch) | |
| tree | 8940f6aba64f506f6df08ed0725572c3f0e0b94a /keystore/java/android/security/KeyStore.java | |
| parent | cc318221a520c9c155a3769cd5fd1de69aa6767d (diff) | |
| parent | d5dd5ebaedb530e928f82dfbd7db557200dd0d5e (diff) | |
Merge "Keystore 2.0: Clear Uid/Namesapce"
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
| -rw-r--r-- | keystore/java/android/security/KeyStore.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index 198df40c7d7b..93658e69eac8 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -43,6 +43,7 @@ import android.security.keystore.KeyPermanentlyInvalidatedException; import android.security.keystore.KeyProperties; import android.security.keystore.KeystoreResponse; import android.security.keystore.UserNotAuthenticatedException; +import android.system.keystore2.Domain; import android.util.Log; import com.android.internal.org.bouncycastle.asn1.ASN1InputStream; @@ -466,6 +467,9 @@ public class KeyStore { public boolean clearUid(int uid) { try { + if (android.security.keystore2.AndroidKeyStoreProvider.isInstalled()) { + return AndroidKeyStoreMaintenance.clearNamespace(Domain.APP, uid) == 0; + } return mBinder.clear_uid(uid) == NO_ERROR; } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); |