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/Authorization.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/Authorization.java')
| -rw-r--r-- | keystore/java/android/security/Authorization.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/keystore/java/android/security/Authorization.java b/keystore/java/android/security/Authorization.java index 50a90820117d..bd72d45297c1 100644 --- a/keystore/java/android/security/Authorization.java +++ b/keystore/java/android/security/Authorization.java @@ -48,7 +48,6 @@ public class Authorization { * @return 0 if successful or {@code ResponseCode.SYSTEM_ERROR}. */ public static int addAuthToken(@NonNull HardwareAuthToken authToken) { - if (!android.security.keystore2.AndroidKeyStoreProvider.isInstalled()) return 0; try { getService().addAuthToken(authToken); return 0; @@ -80,7 +79,6 @@ public class Authorization { */ public static int onLockScreenEvent(@NonNull boolean locked, @NonNull int userId, @Nullable byte[] syntheticPassword) { - if (!android.security.keystore2.AndroidKeyStoreProvider.isInstalled()) return 0; try { if (locked) { getService().onLockScreenEvent(LockScreenEvent.LOCK, userId, null); |