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

Commit 3cf730f6 authored by Kasia Krejszeff's avatar Kasia Krejszeff Committed by Android (Google) Code Review
Browse files

Merge "Fix an assumption that UserHandle.myUserId() always returns the main user." into main

parents b79b19a0 ad6fbc96

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());