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 
am: 18c8690b7e

Change-Id: I1785c42b09f51d8a7ac72a522b5a9d3fdb83e1f8
This commit is contained in:
Ricky Wai
2016-06-08 14:46:29 +00:00
committed by android-build-merger
parent 65cc64dfbc 18c8690b7e
commit dfe00c9ed6
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.SparseArray;
import com.android.internal.util.ArrayUtils;
import java.io.File;
import java.text.Collator;
import java.text.Normalizer;
@@ -123,8 +125,8 @@ public class ApplicationsState {
mPm = mContext.getPackageManager();
mIpm = AppGlobals.getPackageManager();
mUm = (UserManager) app.getSystemService(Context.USER_SERVICE);
for (UserHandle user : mUm.getUserProfiles()) {
mEntriesMap.put(user.getIdentifier(), new HashMap<String, AppEntry>());
for (int userId : mUm.getProfileIdsWithDisabled(UserHandle.myUserId())) {
mEntriesMap.put(userId, new HashMap<String, AppEntry>());
}
mThread = new HandlerThread("ApplicationsState.Loader",
Process.THREAD_PRIORITY_BACKGROUND);
@@ -426,7 +428,8 @@ public class ApplicationsState {
}
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) {
mEntriesMap.put(userId, new HashMap<String, AppEntry>());
if (mResumed) {