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

Commit d94d5ab1 authored by Jigar Thakkar's avatar Jigar Thakkar Committed by Android (Google) Code Review
Browse files

Merge "Cleanup the flag show_different_creation_error_for_unsupported_devices" into main

parents 0045dbc3 3ec39b3a

core/java/android/content/pm/multiuser.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -379,16 +379,6 @@ flag { 
  }

}



flag {

  name: "show_different_creation_error_for_unsupported_devices"

  namespace: "profile_experiences"

  description: "On private space create error due to child account added/fully managed user show message with link to the Help Center to find out more."

  bug: "340130375"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "unicorn_mode_refactoring_for_hsum_read_only"

  namespace: "multiuser"

services/core/java/com/android/server/pm/UserManagerService.java

+2 −7
Original line number Diff line number Diff line
@@ -8772,13 +8772,8 @@ public class UserManagerService extends IUserManager.Stub { 
            String errorMessage = (message != null ? (message + ": ") : "")

                    + restriction + " is enabled.";

            Slog.w(LOG_TAG, errorMessage);

            if (android.multiuser.Flags.showDifferentCreationErrorForUnsupportedDevices()) {

            throw new UserManager.CheckedUserOperationException(errorMessage,

                USER_OPERATION_ERROR_USER_RESTRICTED);

            } else {

                throw new UserManager.CheckedUserOperationException(errorMessage,

                    USER_OPERATION_ERROR_UNKNOWN);

            }

        }

    }