Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove isSeparateProfileChallengeAllowed API"

Browse Source
This commit is contained in:
Ayush Sharma
2021-08-13 15:49:02 +00:00
committed by Android (Google) Code Review
parent 4efe2d55d7 deb33311db
commit 3236d5e5a3
4 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -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

2
core/java/android/app/admin/IDevicePolicyManager.aidl
View File

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

8
core/java/com/android/internal/widget/LockPatternUtils.java
View File

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

11
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

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