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

Fix Exception message in UserController#handleIncomingUser

Browse Source 
Currently the security exception message always states that
you need INTERACT_ACROSS_USERS if allowMode is not ALLOW_FULL_ONLY.
This is incorrect for allowModes ALLOW_NON_FULL_IN_PROFILE and
ALLOW_ALL_PROFILE_PERMISSIONS_IN_PROFILE, in that case the two
users need to be in the same profile group.

Fixes: 154710776
Test: checked the security message with different permissions
Change-Id: I28977b8f9f9463f6bfa4ea88db0d82c5a7d18057
This commit is contained in:
kholoud mohamed
2020-04-22 16:02:48 +01:00
committed by Kholoud Mohamed
parent d48ca975b6
commit 0e8a572d5f
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 ");