Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818600

Change-Id: I72a8b6c975ffd6f6292a686515a843737f6ea57f
This commit is contained in:
TreeHugger Robot
2020-06-19 06:18:37 +00:00
committed by Automerger Merge Worker
parent f3699f1ca6 ec09cbef94
commit 2f67af39f9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -1141,8 +1141,6 @@ class StorageManagerService extends IStorageManager.Stub
Slog.wtf(TAG, e); Slog.wtf(TAG, e);
} }
onKeyguardStateChanged(false);
mHandler.obtainMessage(H_COMPLETE_UNLOCK_USER, userId).sendToTarget(); mHandler.obtainMessage(H_COMPLETE_UNLOCK_USER, userId).sendToTarget();
} }
@@ -1154,6 +1152,8 @@ class StorageManagerService extends IStorageManager.Stub
mPmInternal.migrateLegacyObbData(); mPmInternal.migrateLegacyObbData();
} }
onKeyguardStateChanged(false);
// Record user as started so newly mounted volumes kick off events // Record user as started so newly mounted volumes kick off events
// correctly, then synthesize events for any already-mounted volumes. // correctly, then synthesize events for any already-mounted volumes.
synchronized (mLock) { synchronized (mLock) {