Merge "Change some UserManager APIs to @SystemApi" (c2813cf1) · Commits · e / os / android_frameworks_base

api/current.txt

+7 −7

Original line number	Diff line number	Diff line
		@@ -36506,10 +36506,10 @@ package android.os {
		method public static android.content.Intent createUserCreationIntent(@Nullable String, @Nullable String, @Nullable String, @Nullable android.os.PersistableBundle);
		method @WorkerThread public android.os.Bundle getApplicationRestrictions(String);
		method public long getSerialNumberForUser(android.os.UserHandle);
		method public int getUserCount();
		method @RequiresPermission("android.permission.MANAGE_USERS") public int getUserCount();
		method public long getUserCreationTime(android.os.UserHandle);
		method public android.os.UserHandle getUserForSerialNumber(long);
		method public String getUserName();
		method @NonNull @RequiresPermission(anyOf={"android.permission.MANAGE_USERS", android.Manifest.permission.GET_ACCOUNTS_PRIVILEGED}, conditional=true) public String getUserName();
		method public java.util.List<android.os.UserHandle> getUserProfiles();
		method public android.os.Bundle getUserRestrictions();
		method @RequiresPermission(anyOf={"android.permission.MANAGE_USERS", "android.permission.INTERACT_ACROSS_USERS"}, conditional=true) public android.os.Bundle getUserRestrictions(android.os.UserHandle);
		@@ -36519,14 +36519,14 @@ package android.os {
		method public boolean isQuietModeEnabled(android.os.UserHandle);
		method public boolean isSystemUser();
		method public boolean isUserAGoat();
		method public boolean isUserRunning(android.os.UserHandle);
		method public boolean isUserRunningOrStopping(android.os.UserHandle);
		method @RequiresPermission(anyOf={"android.permission.MANAGE_USERS", "android.permission.INTERACT_ACROSS_USERS"}, conditional=true) public boolean isUserRunning(android.os.UserHandle);
		method @RequiresPermission(anyOf={"android.permission.MANAGE_USERS", "android.permission.INTERACT_ACROSS_USERS"}, conditional=true) public boolean isUserRunningOrStopping(android.os.UserHandle);
		method public boolean isUserUnlocked();
		method public boolean isUserUnlocked(android.os.UserHandle);
		method public boolean requestQuietModeEnabled(boolean, @NonNull android.os.UserHandle);
		method @RequiresPermission(anyOf={"android.permission.MANAGE_USERS", "android.permission.INTERACT_ACROSS_USERS"}, conditional=true) public boolean isUserUnlocked(android.os.UserHandle);
		method @RequiresPermission(anyOf={"android.permission.MANAGE_USERS", "android.permission.MODIFY_QUIET_MODE"}, conditional=true) public boolean requestQuietModeEnabled(boolean, @NonNull android.os.UserHandle);
		method public boolean requestQuietModeEnabled(boolean, @NonNull android.os.UserHandle, int);
		method @Deprecated public boolean setRestrictionsChallenge(String);
		method @Deprecated public void setUserRestriction(String, boolean);
		method @Deprecated @RequiresPermission("android.permission.MANAGE_USERS") public void setUserRestriction(String, boolean);
		method @Deprecated public void setUserRestrictions(android.os.Bundle);
		method @Deprecated public void setUserRestrictions(android.os.Bundle, android.os.UserHandle);
		method public static boolean supportsMultipleUsers();

api/system-current.txt

+19 −9

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@ package android {
		field public static final String CONTROL_INCALL_EXPERIENCE = "android.permission.CONTROL_INCALL_EXPERIENCE";
		field public static final String CONTROL_KEYGUARD_SECURE_NOTIFICATIONS = "android.permission.CONTROL_KEYGUARD_SECURE_NOTIFICATIONS";
		field public static final String CONTROL_VPN = "android.permission.CONTROL_VPN";
		field public static final String CREATE_USERS = "android.permission.CREATE_USERS";
		field public static final String CRYPT_KEEPER = "android.permission.CRYPT_KEEPER";
		field public static final String DEVICE_POWER = "android.permission.DEVICE_POWER";
		field public static final String DISPATCH_PROVISIONING_MESSAGE = "android.permission.DISPATCH_PROVISIONING_MESSAGE";
		@@ -327,7 +328,7 @@ package android.app {
		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getPackageImportance(String);
		method @NonNull public java.util.Collection<java.util.Locale> getSupportedLocales();
		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getUidImportance(int);
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, "android.permission.CREATE_USERS"}) public boolean isProfileForeground(@NonNull android.os.UserHandle);
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean isProfileForeground(@NonNull android.os.UserHandle);
		method @RequiresPermission(android.Manifest.permission.FORCE_STOP_PACKAGES) public void killProcessesWhenImperceptible(@NonNull int[], @NonNull String);
		method @RequiresPermission(android.Manifest.permission.KILL_UID) public void killUid(int, String);
		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void removeOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener);
		@@ -8015,6 +8016,7 @@ package android.os {

		public class UserManager {
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void clearSeedAccountData();
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.os.UserHandle createProfile(@NonNull String, @NonNull String, @Nullable String[]) throws android.os.UserManager.UserOperationException;
		method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public android.os.UserHandle getProfileParent(@NonNull android.os.UserHandle);
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public String getSeedAccountName();
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public android.os.PersistableBundle getSeedAccountOptions();
		@@ -8022,22 +8024,26 @@ package android.os {
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public long[] getSerialNumbersOfUsers(boolean);
		method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public java.util.List<android.os.UserHandle> getUserHandles(boolean);
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.GET_ACCOUNTS_PRIVILEGED}) public android.graphics.Bitmap getUserIcon();
		method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}, conditional=true) public java.util.List<android.os.UserHandle> getUserProfiles(boolean);
		method @Deprecated @android.os.UserManager.UserRestrictionSource @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public int getUserRestrictionSource(String, android.os.UserHandle);
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public java.util.List<android.os.UserManager.EnforcingUser> getUserRestrictionSources(String, android.os.UserHandle);
		method @RequiresPermission(allOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}, conditional=true) public int getUserSwitchability();
		method public boolean hasRestrictedProfiles();
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean hasRestrictedProfiles();
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}, conditional=true) public boolean hasUserRestrictionForUser(@NonNull String, @NonNull android.os.UserHandle);
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isAdminUser();
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isGuestUser();
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isManagedProfile(int);
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isPrimaryUser();
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean isGuestUser();
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}, conditional=true) public boolean isManagedProfile(int);
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean isPrimaryUser();
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}, conditional=true) public boolean isProfile();
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isRestrictedProfile();
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isRestrictedProfile(@NonNull android.os.UserHandle);
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean isRestrictedProfile(@NonNull android.os.UserHandle);
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isSameProfileGroup(@NonNull android.os.UserHandle, @NonNull android.os.UserHandle);
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.GET_ACCOUNTS_PRIVILEGED}) public boolean isUserNameSet();
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public boolean isUserUnlockingOrUnlocked(@NonNull android.os.UserHandle);
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean removeUser(@NonNull android.os.UserHandle);
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void setUserIcon(@NonNull android.graphics.Bitmap);
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isUserOfType(@NonNull String);
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isUserOfType(@NonNull android.os.UserHandle, @NonNull String);
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}, conditional=true) public boolean isUserUnlockingOrUnlocked(@NonNull android.os.UserHandle);
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean removeUser(@NonNull android.os.UserHandle);
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void setUserIcon(@NonNull android.graphics.Bitmap) throws android.os.UserManager.UserOperationException;
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void setUserName(@Nullable String);
		field public static final String ACTION_USER_RESTRICTIONS_CHANGED = "android.os.action.USER_RESTRICTIONS_CHANGED";
		field @Deprecated public static final String DISALLOW_OEM_UNLOCK = "no_oem_unlock";
		@@ -8050,6 +8056,10 @@ package android.os {
		field public static final int SWITCHABILITY_STATUS_SYSTEM_USER_LOCKED = 4; // 0x4
		field public static final int SWITCHABILITY_STATUS_USER_IN_CALL = 1; // 0x1
		field public static final int SWITCHABILITY_STATUS_USER_SWITCH_DISALLOWED = 2; // 0x2
		field public static final String USER_TYPE_FULL_SECONDARY = "android.os.usertype.full.SECONDARY";
		field public static final String USER_TYPE_FULL_SYSTEM = "android.os.usertype.full.SYSTEM";
		field public static final String USER_TYPE_PROFILE_MANAGED = "android.os.usertype.profile.MANAGED";
		field public static final String USER_TYPE_SYSTEM_HEADLESS = "android.os.usertype.system.HEADLESS";
		}

		public static final class UserManager.EnforcingUser implements android.os.Parcelable {

core/java/android/os/IUserManager.aidl

+5 −5

Original line number	Diff line number	Diff line
		@@ -41,11 +41,11 @@ interface IUserManager {
		* END OF DO NOT MOVE
		*/

		UserInfo createUser(in String name, in String userType, int flags);
		UserInfo preCreateUser(in String userType);
		UserInfo createProfileForUser(in String name, in String userType, int flags, int userId,
		UserInfo createUserWithThrow(in String name, in String userType, int flags);
		UserInfo preCreateUserWithThrow(in String userType);
		UserInfo createProfileForUserWithThrow(in String name, in String userType, int flags, int userId,
		in String[] disallowedPackages);
		UserInfo createRestrictedProfile(String name, int parentUserHandle);
		UserInfo createRestrictedProfileWithThrow(String name, int parentUserHandle);
		void setUserEnabled(int userId);
		void setUserAdmin(int userId);
		void evictCredentialEncryptionKey(int userId);
		@@ -100,7 +100,7 @@ interface IUserManager {
		boolean isManagedProfile(int userId);
		boolean isDemoUser(int userId);
		boolean isPreCreated(int userId);
		UserInfo createProfileForUserEvenWhenDisallowed(in String name, in String userType, int flags,
		UserInfo createProfileForUserEvenWhenDisallowedWithThrow(in String name, in String userType, int flags,
		int userId, in String[] disallowedPackages);
		boolean isUserUnlockingOrUnlocked(int userId);
		int getUserIconBadgeResId(int userId);

core/java/android/os/UserManager.java

+361 −110

File changed.

Preview size limit exceeded, changes collapsed.

core/res/AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -2369,7 +2369,7 @@
		<permission android:name="android.permission.MANAGE_USERS"
		android:protectionLevel="signature\|privileged" />

		<!-- @hide Allows an application to create, remove users and get the list of
		<!-- @SystemApi @hide Allows an application to create, remove users and get the list of
		users on the device. Applications holding this permission can only create restricted,
		guest, managed, demo, and ephemeral users. For creating other kind of users,
		{@link android.Manifest.permission#MANAGE_USERS} is needed.