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

Commit ad6fbc96 authored by Kasia Krejszeff's avatar Kasia Krejszeff
Browse files

Fix an assumption that UserHandle.myUserId() always returns the main 

user.

In some cases, e.g. in Private Space Storage Info fragment it returns
the Private profile id and this was leading to a crash, see b/378471943.

Bug: 378471943
Test: Manually and presubmit
Flag: com.android.settings.flags.utils_return_user_handle_for_current_user_id
Change-Id: I5f7bedc66ebcac8b0ae265b7189dd1821edb3cd7
parent 891ea3d1

aconfig/settings_flag_declarations.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -70,3 +70,13 @@ flag { 
  description: "Flag for catalyst service"

  bug: "323791114"

}



flag {

  name: "utils_return_user_handle_for_current_user_id"

  namespace: "profile_experiences"

  description: "Don't ignore the current user id when checking for existing profiles."

  bug: "378471943"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}

src/com/android/settings/Utils.java

+2 −1
Original line number Diff line number Diff line
@@ -424,7 +424,8 @@ public final class Utils extends com.android.settingslib.Utils { 
        final List<UserHandle> userProfiles = userManager.getUserProfiles();

        String umUserType = getUmUserType(userType);

        for (UserHandle profile : userProfiles) {

            if (profile.getIdentifier() == UserHandle.myUserId()) {

            if (!com.android.settings.flags.Flags.utilsReturnUserHandleForCurrentUserId()

                    && profile.getIdentifier() == UserHandle.myUserId()) {

                continue;

            }

            final UserInfo userInfo = userManager.getUserInfo(profile.getIdentifier());