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

Commit f4ecc237 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "UserController: add UserHandle extra to user switched broadcast" am:... 

Merge "UserController: add UserHandle extra to user switched broadcast" am: 55593ee9 am: 7ff86a50

Change-Id: I5e5915824484ecf9f7c9375677ac86d6f01875f5
parents c2ddc097 7ff86a50

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

+9 −0
Original line number Diff line number Diff line
@@ -1560,6 +1560,9 @@ class UserController implements Handler.Callback { 
                    intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY

                            | Intent.FLAG_RECEIVER_FOREGROUND);

                    intent.putExtra(Intent.EXTRA_USER_HANDLE, profileUserId);

                    // Also, add the UserHandle for mainline modules which can't use the @hide

                    // EXTRA_USER_HANDLE.

                    intent.putExtra(Intent.EXTRA_USER, UserHandle.of(profileUserId));

                    mInjector.broadcastIntent(intent,

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

                            null, false, false, MY_PID, SYSTEM_UID, callingUid, callingPid,
@@ -1576,6 +1579,9 @@ class UserController implements Handler.Callback { 
                    intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY

                            | Intent.FLAG_RECEIVER_FOREGROUND);

                    intent.putExtra(Intent.EXTRA_USER_HANDLE, profileUserId);

                    // Also, add the UserHandle for mainline modules which can't use the @hide

                    // EXTRA_USER_HANDLE.

                    intent.putExtra(Intent.EXTRA_USER, UserHandle.of(profileUserId));

                    mInjector.broadcastIntent(intent,

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

                            null, false, false, MY_PID, SYSTEM_UID, callingUid, callingPid,
@@ -1585,6 +1591,9 @@ class UserController implements Handler.Callback { 
                intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY

                        | Intent.FLAG_RECEIVER_FOREGROUND);

                intent.putExtra(Intent.EXTRA_USER_HANDLE, newUserId);

                // Also, add the UserHandle for mainline modules which can't use the @hide

                // EXTRA_USER_HANDLE.

                intent.putExtra(Intent.EXTRA_USER, UserHandle.of(newUserId));

                mInjector.broadcastIntent(intent,

                        null, null, 0, null, null,

                        new String[] {android.Manifest.permission.MANAGE_USERS},