PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide managed profile entry in secondary users

Browse Source 
Bug: 18132630
Change-Id: I0395373ac6f088f8fc880110c740cb5f05827901
This commit is contained in:
Alexandra Gherghina
2014-10-30 18:06:55 +00:00
parent 0f5440f6e2
commit c41d613751
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/applications/RunningState.java
View File

@@ -80,6 +80,7 @@ public class RunningState {
final PackageManager mPm; final PackageManager mPm;
final UserManager mUm; final UserManager mUm;
final int mMyUserId; final int mMyUserId;
final boolean mHideManagedProfiles;
OnRefreshUiListener mRefreshUiListener; OnRefreshUiListener mRefreshUiListener;
@@ -744,6 +745,7 @@ public class RunningState {
mPm = mApplicationContext.getPackageManager(); mPm = mApplicationContext.getPackageManager();
mUm = (UserManager)mApplicationContext.getSystemService(Context.USER_SERVICE); mUm = (UserManager)mApplicationContext.getSystemService(Context.USER_SERVICE);
mMyUserId = UserHandle.myUserId(); mMyUserId = UserHandle.myUserId();
mHideManagedProfiles = mMyUserId != UserHandle.USER_OWNER;
mResumed = false; mResumed = false;
mBackgroundThread = new HandlerThread("RunningState:Background"); mBackgroundThread = new HandlerThread("RunningState:Background");
mBackgroundThread.start(); mBackgroundThread.start();
@@ -828,6 +830,12 @@ public class RunningState {
MergedItem userItem = userItems.get(newItem.mUserId); MergedItem userItem = userItems.get(newItem.mUserId);
boolean first = userItem == null || userItem.mCurSeq != mSequence; boolean first = userItem == null || userItem.mCurSeq != mSequence;
if (first) { if (first) {
UserState userState = mUsers.get(newItem.mUserId);
UserInfo info = userState != null
? userState.mInfo : mUm.getUserInfo(newItem.mUserId);
if (mHideManagedProfiles && info.isManagedProfile()) {
return;
}
if (userItem == null) { if (userItem == null) {
userItem = new MergedItem(newItem.mUserId); userItem = new MergedItem(newItem.mUserId);
userItems.put(newItem.mUserId, userItem); userItems.put(newItem.mUserId, userItem);
@@ -835,9 +843,8 @@ public class RunningState {
userItem.mChildren.clear(); userItem.mChildren.clear();
} }
userItem.mCurSeq = mSequence; userItem.mCurSeq = mSequence;
if ((userItem.mUser=mUsers.get(newItem.mUserId)) == null) { if (userState == null) {
userItem.mUser = new UserState(); userItem.mUser = new UserState();
UserInfo info = mUm.getUserInfo(newItem.mUserId);
userItem.mUser.mInfo = info; userItem.mUser.mInfo = info;
userItem.mUser.mIcon = Utils.getUserIcon(context, mUm, info); userItem.mUser.mIcon = Utils.getUserIcon(context, mUm, info);
userItem.mUser.mLabel = Utils.getUserLabel(context, info); userItem.mUser.mLabel = Utils.getUserLabel(context, info);