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

Merge "Make Settings->Apps can handle work apps even work profile not enabled yet" into nyc-dev

Browse Source
This commit is contained in:
Ricky Wai
2016-06-08 14:33:55 +00:00
committed by Android (Google) Code Review
parent 464f7e4983 b87b0edfb3
commit 18c8690b7e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
View File

@@ -46,6 +46,8 @@ import android.text.format.Formatter;
import android.util.Log; import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
import com.android.internal.util.ArrayUtils;
import java.io.File; import java.io.File;
import java.text.Collator; import java.text.Collator;
import java.text.Normalizer; import java.text.Normalizer;
@@ -123,8 +125,8 @@ public class ApplicationsState {
mPm = mContext.getPackageManager(); mPm = mContext.getPackageManager();
mIpm = AppGlobals.getPackageManager(); mIpm = AppGlobals.getPackageManager();
mUm = (UserManager) app.getSystemService(Context.USER_SERVICE); mUm = (UserManager) app.getSystemService(Context.USER_SERVICE);
for (UserHandle user : mUm.getUserProfiles()) { for (int userId : mUm.getProfileIdsWithDisabled(UserHandle.myUserId())) {
mEntriesMap.put(user.getIdentifier(), new HashMap<String, AppEntry>()); mEntriesMap.put(userId, new HashMap<String, AppEntry>());
} }
mThread = new HandlerThread("ApplicationsState.Loader", mThread = new HandlerThread("ApplicationsState.Loader",
Process.THREAD_PRIORITY_BACKGROUND); Process.THREAD_PRIORITY_BACKGROUND);
@@ -426,7 +428,8 @@ public class ApplicationsState {
} }
private void addUser(int userId) { private void addUser(int userId) {
if (mUm.getUserProfiles().contains(new UserHandle(userId))) { final int profileIds[] = mUm.getProfileIdsWithDisabled(UserHandle.myUserId());
if (ArrayUtils.contains(profileIds, userId)) {
synchronized (mEntriesMap) { synchronized (mEntriesMap) {
mEntriesMap.put(userId, new HashMap<String, AppEntry>()); mEntriesMap.put(userId, new HashMap<String, AppEntry>());
if (mResumed) { if (mResumed) {