Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea95ab56 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Send onUnlockUser() before PRE_BOOT broadcasts." into nyc-dev 

am: 3c58bedd

* commit '3c58bedd':
  Send onUnlockUser() before PRE_BOOT broadcasts.

Change-Id: I66a88a95dc357807c388272e26c9ceba9bd58788
parents 276d8726 3c58bedd

services/core/java/com/android/server/am/UserController.java

+3 −3
Original line number Diff line number Diff line
@@ -260,6 +260,9 @@ final class UserController { 
                mUserManager.onBeforeUnlockUser(userId);

                progress.setProgress(20);



                // Dispatch unlocked to system services

                mHandler.sendMessage(mHandler.obtainMessage(SYSTEM_USER_UNLOCK_MSG, userId, 0));



                // Send PRE_BOOT broadcasts if fingerprint changed

                final UserInfo info = getUserInfo(userId);

                if (!Objects.equals(info.lastLoggedInFingerprint, Build.FINGERPRINT)) {
@@ -302,9 +305,6 @@ final class UserController { 
                // Remember that we logged in

                mUserManager.onUserLoggedIn(userId);



                // Dispatch unlocked to system services

                mHandler.sendMessage(mHandler.obtainMessage(SYSTEM_USER_UNLOCK_MSG, userId, 0));



                // Dispatch unlocked to external apps

                final Intent unlockedIntent = new Intent(Intent.ACTION_USER_UNLOCKED);

                unlockedIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId);