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

Merge "Support profile global restrictions in disclosure messages." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-27 16:23:00 +00:00
committed by Android (Google) Code Review
parent 04225787d8 749c7a64a7
commit b258552a1c
1 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java
View File

@@ -35,8 +35,8 @@ import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.provider.Settings; import android.provider.Settings;
import android.support.annotation.VisibleForTesting; import android.support.annotation.VisibleForTesting;
import android.text.Spanned;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.style.ForegroundColorSpan; import android.text.style.ForegroundColorSpan;
import android.text.style.ImageSpan; import android.text.style.ImageSpan;
import android.view.MenuItem; import android.view.MenuItem;
@@ -75,41 +75,52 @@ public class RestrictedLockUtils {
*/ */
public static EnforcedAdmin checkIfRestrictionEnforced(Context context, public static EnforcedAdmin checkIfRestrictionEnforced(Context context,
String userRestriction, int userId) { String userRestriction, int userId) {
DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService( final DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
Context.DEVICE_POLICY_SERVICE); Context.DEVICE_POLICY_SERVICE);
if (dpm == null) { if (dpm == null) {
return null; return null;
} }
UserManager um = UserManager.get(context);
int restrictionSource = um.getUserRestrictionSource(userRestriction,
UserHandle.of(userId));
// If the restriction is not enforced or enforced only by system then return null final UserManager um = UserManager.get(context);
if (restrictionSource == UserManager.RESTRICTION_NOT_SET final List<UserManager.EnforcingUser> enforcingUsers =
|| restrictionSource == UserManager.RESTRICTION_SOURCE_SYSTEM) { um.getUserRestrictionSources(userRestriction, UserHandle.of(userId));
if (enforcingUsers.isEmpty()) {
// Restriction is not enforced.
return null; return null;
} else if (enforcingUsers.size() > 1) {
return EnforcedAdmin.MULTIPLE_ENFORCED_ADMIN;
} }
final boolean enforcedByProfileOwner = final int restrictionSource = enforcingUsers.get(0).getUserRestrictionSource();
(restrictionSource & UserManager.RESTRICTION_SOURCE_PROFILE_OWNER) != 0; final int adminUserId = enforcingUsers.get(0).getUserHandle().getIdentifier();
final boolean enforcedByDeviceOwner =
(restrictionSource & UserManager.RESTRICTION_SOURCE_DEVICE_OWNER) != 0; if (restrictionSource == UserManager.RESTRICTION_SOURCE_PROFILE_OWNER) {
if (enforcedByProfileOwner) { // Check if it is a profile owner of the user under consideration.
return getProfileOwner(context, userId); if (adminUserId == userId) {
} else if (enforcedByDeviceOwner) { return getProfileOwner(context, adminUserId);
} else {
// Check if it is a profile owner of a managed profile of the current user.
// Otherwise it is in a separate user and we return a default EnforcedAdmin.
final UserInfo parentUser = um.getProfileParent(adminUserId);
return (parentUser != null && parentUser.id == userId)
? getProfileOwner(context, adminUserId)
: EnforcedAdmin.MULTIPLE_ENFORCED_ADMIN;
}
} else if (restrictionSource == UserManager.RESTRICTION_SOURCE_DEVICE_OWNER) {
// When the restriction is enforced by device owner, return the device owner admin only // When the restriction is enforced by device owner, return the device owner admin only
// if the admin is for the {@param userId} otherwise return a default EnforcedAdmin. // if the admin is for the {@param userId} otherwise return a default EnforcedAdmin.
final EnforcedAdmin deviceOwner = getDeviceOwner(context); return adminUserId == userId
return deviceOwner.userId == userId ? getDeviceOwner(context) : EnforcedAdmin.MULTIPLE_ENFORCED_ADMIN;
? deviceOwner
: EnforcedAdmin.MULTIPLE_ENFORCED_ADMIN;
} }
// If the restriction is enforced by system then return null.
return null; return null;
} }
public static boolean hasBaseUserRestriction(Context context, public static boolean hasBaseUserRestriction(Context context,
String userRestriction, int userId) { String userRestriction, int userId) {
UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE); final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
return um.hasBaseUserRestriction(userRestriction, UserHandle.of(userId)); return um.hasBaseUserRestriction(userRestriction, UserHandle.of(userId));
} }
@@ -424,7 +435,6 @@ public class RestrictedLockUtils {
if (dpm == null) { if (dpm == null) {
return null; return null;
} }
LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
EnforcedAdmin enforcedAdmin = null; EnforcedAdmin enforcedAdmin = null;
final int userId = UserHandle.myUserId(); final int userId = UserHandle.myUserId();
final UserManager um = UserManager.get(context); final UserManager um = UserManager.get(context);