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

Merge "UserController: add UserHandle extra to user switched broadcast" am: 55593ee940 am: 7ff86a50de

Browse Source 
Change-Id: I5e5915824484ecf9f7c9375677ac86d6f01875f5
This commit is contained in:
Automerger Merge Worker
2020-01-23 21:37:57 +00:00
parent c2ddc0976d 7ff86a50de
commit f4ecc2372a
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/am/UserController.java
View File

@@ -1560,6 +1560,9 @@ class UserController implements Handler.Callback {
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY
| Intent.FLAG_RECEIVER_FOREGROUND); | Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(Intent.EXTRA_USER_HANDLE, profileUserId); 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, mInjector.broadcastIntent(intent,
null, null, 0, null, null, null, AppOpsManager.OP_NONE, null, null, 0, null, null, null, AppOpsManager.OP_NONE,
null, false, false, MY_PID, SYSTEM_UID, callingUid, callingPid, 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.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY
| Intent.FLAG_RECEIVER_FOREGROUND); | Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(Intent.EXTRA_USER_HANDLE, profileUserId); 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, mInjector.broadcastIntent(intent,
null, null, 0, null, null, null, AppOpsManager.OP_NONE, null, null, 0, null, null, null, AppOpsManager.OP_NONE,
null, false, false, MY_PID, SYSTEM_UID, callingUid, callingPid, 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.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY
| Intent.FLAG_RECEIVER_FOREGROUND); | Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(Intent.EXTRA_USER_HANDLE, newUserId); 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, mInjector.broadcastIntent(intent,
null, null, 0, null, null, null, null, 0, null, null,
new String[] {android.Manifest.permission.MANAGE_USERS}, new String[] {android.Manifest.permission.MANAGE_USERS},