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: b177adde9b

Browse Source 
Change-Id: Ia15f7444c7c61d5cc840f801e846c0d0ec16f23a
This commit is contained in:
Kholoud Mohamed
2020-04-23 10:47:46 +00:00
committed by Automerger Merge Worker
parent 50ca8e9c2f b177adde9b
commit 3c9262c65c
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("; this requires ");
builder.append(INTERACT_ACROSS_USERS_FULL); builder.append(INTERACT_ACROSS_USERS_FULL);
if (allowMode != ALLOW_FULL_ONLY) { if (allowMode != ALLOW_FULL_ONLY) {
builder.append(" or "); if (allowMode == ALLOW_NON_FULL || isSameProfileGroup) {
builder.append(INTERACT_ACROSS_USERS); builder.append(" or ");
builder.append(INTERACT_ACROSS_USERS);
}
if (isSameProfileGroup if (isSameProfileGroup
&& allowMode == ALLOW_ALL_PROFILE_PERMISSIONS_IN_PROFILE) { && allowMode == ALLOW_ALL_PROFILE_PERMISSIONS_IN_PROFILE) {
builder.append(" or "); builder.append(" or ");