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

Commit 30ac8ee0 authored by Olivier Nshimiye's avatar Olivier Nshimiye Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in ResolverActivityTest using null safe Objects#equals" into main

parents 59338e28 f1eefce6

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)) {