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

Commit 3c9262c6 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Automerger Merge Worker
Browse files

Merge "Fix Exception message in UserController#handleIncomingUser" into... 

Merge "Fix Exception message in UserController#handleIncomingUser" into rvc-dev am: c62350d8 am: b177adde

Change-Id: Ia15f7444c7c61d5cc840f801e846c0d0ec16f23a
parents 50ca8e9c b177adde

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

+4 −2
Original line number Diff line number Diff line
@@ -1877,8 +1877,10 @@ class UserController implements Handler.Callback { 
                    builder.append("; this requires ");

                    builder.append(INTERACT_ACROSS_USERS_FULL);

                    if (allowMode != ALLOW_FULL_ONLY) {

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