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

Commit f1eefce6 authored by Olivier Nshimiye's avatar Olivier Nshimiye
Browse files

Fix NPE in ResolverActivityTest using null safe Objects#equals 

Bug: 401491952
Test: abtd
Flag: EXEMPT minor bug fix

Change-Id: Ie9098eb5d38a67f461b895daa47e4b260d07414a
parent cdad3b5d

core/java/com/android/internal/app/ResolverActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ public class ResolverActivity extends Activity implements 
        // this happens, we check for it here and set the current profile's tab.

        int selectedProfile = getCurrentProfile();

        UserHandle intentUser = getIntentUser();

        if (!getTabOwnerUserHandleForLaunch().equals(intentUser)) {

        if (!Objects.equals(getTabOwnerUserHandleForLaunch(), intentUser)) {

            if (getPersonalProfileUserHandle().equals(intentUser)) {

                selectedProfile = PROFILE_PERSONAL;

            } else if (getWorkProfileUserHandle().equals(intentUser)) {