Merge "Remove isSeparateProfileChallengeAllowed API" (3236d5e5) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DevicePolicyManager.java

+0 −16

Original line number	Diff line number	Diff line
		@@ -3269,22 +3269,6 @@ public class DevicePolicyManager {
		return false;
		}

		/**
		* Returns true if the Profile Challenge is available to use for the given profile user.
		*
		* @hide
		*/
		public boolean isSeparateProfileChallengeAllowed(int userHandle) {
		if (mService != null) {
		try {
		return mService.isSeparateProfileChallengeAllowed(userHandle);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		return false;
		}

		/**
		* Constant for {@link #setPasswordQuality}: the policy has no requirements
		* for the password. Note that quality constants are ordered so that higher

+0 −2

Original line number	Diff line number	Diff line
		@@ -373,8 +373,6 @@ interface IDevicePolicyManager {
		CharSequence getShortSupportMessageForUser(in ComponentName admin, int userHandle);
		CharSequence getLongSupportMessageForUser(in ComponentName admin, int userHandle);

		boolean isSeparateProfileChallengeAllowed(int userHandle);

		void setOrganizationColor(in ComponentName admin, in int color);
		void setOrganizationColorForUser(in int color, in int userId);
		int getOrganizationColor(in ComponentName admin);

+0 −8

Original line number	Diff line number	Diff line
		@@ -846,14 +846,6 @@ public class LockPatternUtils {
		return isManagedProfile(userHandle) && !hasSeparateChallenge(userHandle);
		}

		/**
		* Retrieves whether the current DPM allows use of the Profile Challenge.
		*/
		public boolean isSeparateProfileChallengeAllowed(int userHandle) {
		return isManagedProfile(userHandle)
		&& getDevicePolicyManager().isSeparateProfileChallengeAllowed(userHandle);
		}

		private boolean hasSeparateChallenge(int userHandle) {
		try {
		return getLockSettings().getSeparateProfileChallengeEnabled(userHandle);

+0 −11

Original line number	Diff line number	Diff line
		@@ -3804,17 +3804,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		}
		}

		@Override
		public boolean isSeparateProfileChallengeAllowed(int userHandle) {
		Preconditions.checkCallAuthorization(isSystemUid(getCallerIdentity()),
		String.format(NOT_SYSTEM_CALLER_MSG, "query separate challenge support"));

		ComponentName profileOwner = getProfileOwnerAsUser(userHandle);
		// Profile challenge is supported on N or newer release.
		return profileOwner != null &&
		getTargetSdk(profileOwner.getPackageName(), userHandle) > Build.VERSION_CODES.M;
		}

		private boolean canSetPasswordQualityOnParent(String packageName, final CallerIdentity caller) {
		return !mInjector.isChangeEnabled(
		PREVENT_SETTING_PASSWORD_QUALITY_ON_PARENT, packageName, caller.getUserId())