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

Commit bdae9296 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Send USER_UNLOCKED broadcasts before PRE_BOOT." into nyc-dev

parents a66bffb0 155e5d6d

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

+25 −25
Original line number Original line Diff line number Diff line
@@ -278,6 +278,31 @@ final class UserController { 
                // Dispatch unlocked to system services

                // Dispatch unlocked to system services

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

                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);

                unlockedIntent.addFlags(

                        Intent.FLAG_RECEIVER_REGISTERED_ONLY | Intent.FLAG_RECEIVER_FOREGROUND);

                mService.broadcastIntentLocked(null, null, unlockedIntent, null, null, 0, null,

                        null, null, AppOpsManager.OP_NONE, null, false, false, MY_PID, SYSTEM_UID,

                        userId);



                if (getUserInfo(userId).isManagedProfile()) {

                    UserInfo parent = getUserManager().getProfileParent(userId);

                    if (parent != null) {

                        final Intent profileUnlockedIntent = new Intent(

                                Intent.ACTION_MANAGED_PROFILE_UNLOCKED);

                        profileUnlockedIntent.putExtra(Intent.EXTRA_USER, UserHandle.of(userId));

                        profileUnlockedIntent.addFlags(

                                Intent.FLAG_RECEIVER_REGISTERED_ONLY

                                | Intent.FLAG_RECEIVER_FOREGROUND);

                        mService.broadcastIntentLocked(null, null, profileUnlockedIntent,

                                null, null, 0, null, null, null, AppOpsManager.OP_NONE,

                                null, false, false, MY_PID, SYSTEM_UID,

                                parent.id);

                    }

                }



                // Send PRE_BOOT broadcasts if fingerprint changed

                // Send PRE_BOOT broadcasts if fingerprint changed

                final UserInfo info = getUserInfo(userId);

                final UserInfo info = getUserInfo(userId);

                if (!Objects.equals(info.lastLoggedInFingerprint, Build.FINGERPRINT)) {

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

                // Remember that we logged in

                mUserManager.onUserLoggedIn(userId);

                mUserManager.onUserLoggedIn(userId);





                // Dispatch unlocked to external apps

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

                unlockedIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId);

                unlockedIntent.addFlags(

                        Intent.FLAG_RECEIVER_REGISTERED_ONLY | Intent.FLAG_RECEIVER_FOREGROUND);

                mService.broadcastIntentLocked(null, null, unlockedIntent, null, null, 0, null,

                        null, null, AppOpsManager.OP_NONE, null, false, false, MY_PID, SYSTEM_UID,

                        userId);



                if (getUserInfo(userId).isManagedProfile()) {

                    UserInfo parent = getUserManager().getProfileParent(userId);

                    if (parent != null) {

                        final Intent profileUnlockedIntent = new Intent(

                                Intent.ACTION_MANAGED_PROFILE_UNLOCKED);

                        profileUnlockedIntent.putExtra(Intent.EXTRA_USER, UserHandle.of(userId));

                        profileUnlockedIntent.addFlags(

                                Intent.FLAG_RECEIVER_REGISTERED_ONLY

                                | Intent.FLAG_RECEIVER_FOREGROUND);

                        mService.broadcastIntentLocked(null, null, profileUnlockedIntent,

                                null, null, 0, null, null, null, AppOpsManager.OP_NONE,

                                null, false, false, MY_PID, SYSTEM_UID,

                                parent.id);

                    }

                }



                final Intent bootIntent = new Intent(Intent.ACTION_BOOT_COMPLETED, null);

                final Intent bootIntent = new Intent(Intent.ACTION_BOOT_COMPLETED, null);

                bootIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId);

                bootIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId);

                bootIntent.addFlags(Intent.FLAG_RECEIVER_NO_ABORT

                bootIntent.addFlags(Intent.FLAG_RECEIVER_NO_ABORT