Merge "Revert "Temporary changes to fix crashes during tests."" into nyc-dev (bc2294b3) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QSTile.java

+5 −9

Original line number	Diff line number	Diff line
		@@ -24,8 +24,6 @@ import android.graphics.drawable.Drawable;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.Message;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.util.Log;
		import android.util.SparseArray;
		import android.view.View;
		@@ -85,8 +83,6 @@ public abstract class QSTile<TState extends State> implements Listenable {
		abstract protected void handleClick();
		abstract protected void handleUpdateState(TState state, Object arg);

		private UserManager mUserManager;

		/**
		* Declare the category of this tile.
		*
		@@ -99,7 +95,6 @@ public abstract class QSTile<TState extends State> implements Listenable {
		mHost = host;
		mContext = host.getContext();
		mHandler = new H(host.getLooper());
		mUserManager = UserManager.get(mContext);
		}

		public String getTileSpec() {
		@@ -290,11 +285,12 @@ public abstract class QSTile<TState extends State> implements Listenable {
		}

		protected void checkIfRestrictionEnforcedByAdminOnly(State state, String userRestriction) {
		UserHandle user = UserHandle.of(ActivityManager.getCurrentUser());
		if (mUserManager.hasUserRestriction(userRestriction, user)
		&& !mUserManager.hasBaseUserRestriction(userRestriction, user)) {
		EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
		userRestriction, ActivityManager.getCurrentUser());
		if (admin != null && !RestrictedLockUtils.hasBaseUserRestriction(mContext,
		userRestriction, ActivityManager.getCurrentUser())) {
		state.disabledByPolicy = true;
		state.enforcedAdmin = EnforcedAdmin.MULTIPLE_ENFORCED_ADMIN;
		state.enforcedAdmin = admin;
		} else {
		state.disabledByPolicy = false;
		state.enforcedAdmin = null;

packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -654,11 +654,12 @@ public class UserSwitcherController {
		}

		private void checkIfAddUserDisallowedByAdminOnly(UserRecord record) {
		UserHandle user = UserHandle.of(ActivityManager.getCurrentUser());
		if (mUserManager.hasUserRestriction(UserManager.DISALLOW_ADD_USER, user)
		&& !mUserManager.hasBaseUserRestriction(UserManager.DISALLOW_ADD_USER, user)) {
		EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
		UserManager.DISALLOW_ADD_USER, ActivityManager.getCurrentUser());
		if (admin != null && !RestrictedLockUtils.hasBaseUserRestriction(mContext,
		UserManager.DISALLOW_ADD_USER, ActivityManager.getCurrentUser())) {
		record.isDisabledByAdmin = true;
		record.enforcedAdmin = EnforcedAdmin.MULTIPLE_ENFORCED_ADMIN;
		record.enforcedAdmin = admin;
		} else {
		record.isDisabledByAdmin = false;
		record.enforcedAdmin = null;