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

am b73390ac: Merge "Fix work apps showing as not installed for owner" into mnc-dev

Browse Source 
* commit 'b73390acdd6a71d74d6ad107520a0f22d2bc5f1e':
  Fix work apps showing as not installed for owner
This commit is contained in:
Jason Monk
2015-06-10 15:07:49 +00:00
committed by Android Git Automerger
parent 15fb34d2ea b73390acdd
commit 473da8b618
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -784,6 +784,21 @@ public class ApplicationsState {
numDone++;
getEntryLocked(info);
}
if (userId != 0 && mEntriesMap.indexOfKey(0) >= 0) {
// If this app is for a profile and we are on the owner, remove
// the owner entry if it isn't installed. This will prevent
// duplicates of work only apps showing up as 'not installed
// for this user'.
// Note: This depends on us traversing the users in order, which
// happens because of the way we generate the list in
// doResumeIfNeededLocked.
AppEntry entry = mEntriesMap.get(0).get(info.packageName);
if (entry != null &&
(entry.info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
mEntriesMap.get(0).remove(info.packageName);
mAppEntries.remove(entry);
}
}
}
if (DEBUG_LOCKING) Log.v(TAG, "MSG_LOAD_ENTRIES releasing lock");
}