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

Merge "Fix comparison of UserHandle objects" into rvc-dev am: 6699c412bb am: a440ea524a am: f17432790e

Browse Source 
Change-Id: If2f8479b51a4c839fc963e26515f6ccc0592939e
This commit is contained in:
TreeHugger Robot
2020-04-20 17:42:08 +00:00
committed by Automerger Merge Worker
parent d69222dbff f17432790e
commit b5b021cdc4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -2611,11 +2611,12 @@ public class ChooserActivity extends ResolverActivity implements
* does not match either the personal or work user handle.
**/
private int getProfileForUser(UserHandle currentUserHandle) {
if (currentUserHandle == getPersonalProfileUserHandle()) {
if (currentUserHandle.equals(getPersonalProfileUserHandle())) {
return PROFILE_PERSONAL;
} else if (currentUserHandle == getWorkProfileUserHandle()) {
} else if (currentUserHandle.equals(getWorkProfileUserHandle())) {
return PROFILE_WORK;
}
Log.e(TAG, "User " + currentUserHandle + " does not belong to a personal or work profile.");
return -1;
}