commit c41d613751e9cc41b787be28a9799f8c6920c4dd
author Alexandra Gherghina <alexgherghina@google.com> Thu Oct 30 18:06:55 2014 +0000
committer Alexandra Gherghina <alexgherghina@google.com> Fri Oct 31 12:04:02 2014 +0000
tree ed28c940f6540d794aed6c67cc2a7c7e4c3dfc0f
parent 0f5440f6e26581f51d67fe3cf32af9dd840e5519

Hide managed profile entry in secondary users

Bug: 18132630
Change-Id: I0395373ac6f088f8fc880110c740cb5f05827901

src/com/android/settings/applications/RunningState.java

diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index a3eabb8..e0ac56c 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -80,6 +80,7 @@
     final PackageManager mPm;
     final UserManager mUm;
     final int mMyUserId;
+    final boolean mHideManagedProfiles;
 
     OnRefreshUiListener mRefreshUiListener;
 
@@ -744,6 +745,7 @@
         mPm = mApplicationContext.getPackageManager();
         mUm = (UserManager)mApplicationContext.getSystemService(Context.USER_SERVICE);
         mMyUserId = UserHandle.myUserId();
+        mHideManagedProfiles = mMyUserId != UserHandle.USER_OWNER;
         mResumed = false;
         mBackgroundThread = new HandlerThread("RunningState:Background");
         mBackgroundThread.start();
@@ -828,6 +830,12 @@
         MergedItem userItem = userItems.get(newItem.mUserId);
         boolean first = userItem == null || userItem.mCurSeq != mSequence;
         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) {
                 userItem = new MergedItem(newItem.mUserId);
                 userItems.put(newItem.mUserId, userItem);
@@ -835,9 +843,8 @@
                 userItem.mChildren.clear();
             }
             userItem.mCurSeq = mSequence;
-            if ((userItem.mUser=mUsers.get(newItem.mUserId)) == null) {
+            if (userState == null) {
                 userItem.mUser = new UserState();
-                UserInfo info = mUm.getUserInfo(newItem.mUserId);
                 userItem.mUser.mInfo = info;
                 userItem.mUser.mIcon = Utils.getUserIcon(context, mUm, info);
                 userItem.mUser.mLabel = Utils.getUserLabel(context, info);