Merge "Move onKeyguardChangded() to completeUnlockUser() (async)" into rvc-dev

2020-06-19 06:04:28 +00:00
parent a2caf278e0 64a3cca2f9
commit ec09cbef94
1 changed files with 2 additions and 2 deletions
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -1141,8 +1141,6 @@ class StorageManagerService extends IStorageManager.Stub
            Slog.wtf(TAG, e);
        }

-        onKeyguardStateChanged(false);
-
        mHandler.obtainMessage(H_COMPLETE_UNLOCK_USER, userId).sendToTarget();
    }

@@ -1154,6 +1152,8 @@ class StorageManagerService extends IStorageManager.Stub
            mPmInternal.migrateLegacyObbData();
        }

+        onKeyguardStateChanged(false);
+
        // Record user as started so newly mounted volumes kick off events
        // correctly, then synthesize events for any already-mounted volumes.
        synchronized (mLock) {