am dc7b3e3b: am 79a80652: Merge "KeyStore: stop using state()" am: 9a51314973

Original change: undetermined Change-Id: Ic2a2223d718af743047dd602bcaca2b0ffb0ea2c
2021-05-31 05:54:22 +00:00
parent 8b3c3089cb 9a51314973
commit eaac89b594
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -3341,7 +3341,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
        // Tear down existing lockdown if profile was removed
        mLockdownEnabled = LockdownVpnTracker.isEnabled();
        if (mLockdownEnabled) {
-            if (mKeyStore.state() != KeyStore.State.UNLOCKED) {
+            if (!mKeyStore.isUnlocked()) {
                Slog.w(TAG, "KeyStore locked; unable to create LockdownTracker");
                return false;
            }