diff options
| author | Janis Danisevskis <jdanis@google.com> | 2021-03-05 10:23:09 -0800 |
|---|---|---|
| committer | Janis Danisevskis <jdanis@google.com> | 2021-04-01 17:06:41 -0700 |
| commit | a6dcf091f59083db52257bd5dc4af69cc22d7fd3 (patch) | |
| tree | b65b9b8e41f06b8de5cfbaab57f403a404ea1113 /keystore/java/android/security/AndroidKeyStoreMaintenance.java | |
| parent | f11ccc456bfc5d0004d3ea398832e4ca16879b6e (diff) | |
Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references
Bug: 171305684
Test: CtsKeystoreTestCases
Change-Id: I337515dadc9e45b909bff058d4e13371b4fa843c
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStoreMaintenance.java')
| -rw-r--r-- | keystore/java/android/security/AndroidKeyStoreMaintenance.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/keystore/java/android/security/AndroidKeyStoreMaintenance.java b/keystore/java/android/security/AndroidKeyStoreMaintenance.java index 72cea0cacd12..82639def02de 100644 --- a/keystore/java/android/security/AndroidKeyStoreMaintenance.java +++ b/keystore/java/android/security/AndroidKeyStoreMaintenance.java @@ -47,7 +47,6 @@ public class AndroidKeyStoreMaintenance { * @hide */ public static int onUserAdded(@NonNull int userId) { - if (!android.security.keystore2.AndroidKeyStoreProvider.isInstalled()) return 0; try { getService().onUserAdded(userId); return 0; @@ -68,7 +67,6 @@ public class AndroidKeyStoreMaintenance { * @hide */ public static int onUserRemoved(int userId) { - if (!android.security.keystore2.AndroidKeyStoreProvider.isInstalled()) return 0; try { getService().onUserRemoved(userId); return 0; @@ -91,7 +89,6 @@ public class AndroidKeyStoreMaintenance { * @hide */ public static int onUserPasswordChanged(int userId, @Nullable byte[] password) { - if (!android.security.keystore2.AndroidKeyStoreProvider.isInstalled()) return 0; try { getService().onUserPasswordChanged(userId, password); return 0; @@ -109,7 +106,6 @@ public class AndroidKeyStoreMaintenance { * be cleared. */ public static int clearNamespace(@Domain int domain, long namespace) { - if (!android.security.keystore2.AndroidKeyStoreProvider.isInstalled()) return 0; try { getService().clearNamespace(domain, namespace); return 0; @@ -144,7 +140,6 @@ public class AndroidKeyStoreMaintenance { * Informs Keystore 2.0 that an off body event was detected. */ public static void onDeviceOffBody() { - if (!android.security.keystore2.AndroidKeyStoreProvider.isInstalled()) return; try { getService().onDeviceOffBody(); } catch (Exception e) { |