diff options
| author | Janis Danisevskis <jdanis@google.com> | 2021-04-03 02:02:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-03 02:02:03 +0000 |
| commit | 9ba0f37f8a0286261e4074463ed0314836c9fd61 (patch) | |
| tree | 66f14fa5a3b4f5037f8822d480936b7f8f0b3e76 /keystore/java/android/security/AndroidKeyStoreMaintenance.java | |
| parent | 9da3f39ceb2a64013e82a772e6ca2116163f913b (diff) | |
| parent | 66ead4fb0bdfb5fe7e9a608d193148ae53e6bf4f (diff) | |
Merge "Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references" am: a8b1b1a2e6 am: 08945c21ef am: 66ead4fb0b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624872
Change-Id: I08fcf329e59c309d9292edc846653b02e7a60f21
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) { |