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

Merge "Revert "Temporary changes to fix crashes during tests."" into nyc-dev

Browse Source 
am: bc2294b

* commit 'bc2294b3c2503105c37d8de4a8cd825189199868':
  Revert "Temporary changes to fix crashes during tests."

Change-Id: I11f2e1c36e7f0ac8c57940b6671c0f815e6c8c73
This commit is contained in:
Sudheer Shanka
2016-03-31 02:17:22 +00:00
committed by android-build-merger
parent 81c6380114 bc2294b3c2
commit e6fcfeae6a
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/qs/QSTile.java
View File

@@ -24,8 +24,6 @@ import android.graphics.drawable.Drawable;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.UserHandle;
import android.os.UserManager;
import android.util.Log; import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
import android.view.View; import android.view.View;
@@ -85,8 +83,6 @@ public abstract class QSTile<TState extends State> implements Listenable {
abstract protected void handleClick(); abstract protected void handleClick();
abstract protected void handleUpdateState(TState state, Object arg); abstract protected void handleUpdateState(TState state, Object arg);
private UserManager mUserManager;
/** /**
* Declare the category of this tile. * Declare the category of this tile.
* *
@@ -99,7 +95,6 @@ public abstract class QSTile<TState extends State> implements Listenable {
mHost = host; mHost = host;
mContext = host.getContext(); mContext = host.getContext();
mHandler = new H(host.getLooper()); mHandler = new H(host.getLooper());
mUserManager = UserManager.get(mContext);
} }
public String getTileSpec() { public String getTileSpec() {
@@ -290,11 +285,12 @@ public abstract class QSTile<TState extends State> implements Listenable {
} }
protected void checkIfRestrictionEnforcedByAdminOnly(State state, String userRestriction) { protected void checkIfRestrictionEnforcedByAdminOnly(State state, String userRestriction) {
UserHandle user = UserHandle.of(ActivityManager.getCurrentUser()); EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
if (mUserManager.hasUserRestriction(userRestriction, user) userRestriction, ActivityManager.getCurrentUser());
&& !mUserManager.hasBaseUserRestriction(userRestriction, user)) { if (admin != null && !RestrictedLockUtils.hasBaseUserRestriction(mContext,
userRestriction, ActivityManager.getCurrentUser())) {
state.disabledByPolicy = true; state.disabledByPolicy = true;
state.enforcedAdmin = EnforcedAdmin.MULTIPLE_ENFORCED_ADMIN; state.enforcedAdmin = admin;
} else { } else {
state.disabledByPolicy = false; state.disabledByPolicy = false;
state.enforcedAdmin = null; state.enforcedAdmin = null;

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

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