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

Merge "Fix Exception message in UserController#handleIncomingUser" into rvc-dev am: c62350d8dc am: 2e49ac758b am: df6574ae6e

Browse Source 
Change-Id: I7e04fab633431a6bfc7ad773b4e82962d99d8c6f
This commit is contained in:
Kholoud Mohamed
2020-04-23 11:06:36 +00:00
committed by Automerger Merge Worker
parent 4be7fe9acc df6574ae6e
commit e023f244ce
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1877,8 +1877,10 @@ class UserController implements Handler.Callback {
builder.append("; this requires ");
builder.append(INTERACT_ACROSS_USERS_FULL);
if (allowMode != ALLOW_FULL_ONLY) {
builder.append(" or ");
builder.append(INTERACT_ACROSS_USERS);
if (allowMode == ALLOW_NON_FULL || isSameProfileGroup) {
builder.append(" or ");
builder.append(INTERACT_ACROSS_USERS);
}
if (isSameProfileGroup
&& allowMode == ALLOW_ALL_PROFILE_PERMISSIONS_IN_PROFILE) {
builder.append(" or ");