diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-04-10 00:27:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-10 00:27:34 +0000 |
| commit | 01da99e3e562d93c902419316b2f6aa464777e16 (patch) | |
| tree | 2fe6d242f8218ab669e2a98f757a85005ff88088 /keystore/java/android/security/AndroidKeyStoreMaintenance.java | |
| parent | 80bf29781b44a4c22692a3a1a1e60a371471c25a (diff) | |
| parent | 6560a5b465795d6922ccd0c83693fa04be2910a6 (diff) | |
Merge changes from topic "SP1A.210407.002" into s-keystone-qcom-dev
* changes:
Adapt to new ranking logic from upstream.
Revert "Initial data pipeline for Smartspace media recommendations data in media carousel."
Merge SP1A.210407.002
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) { |