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

Merge "Detect uninstalled apps during resume" into mnc-dev

Browse Source
This commit is contained in:
Jason Monk
2015-05-07 20:36:17 +00:00
committed by Android (Google) Code Review
parent f4db340dae 4cbf9b2d58
commit 97cebec1a0
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/applications/ApplicationsState.java
View File

@@ -802,10 +802,7 @@ public class ApplicationsState {
if (mInterestingConfigChanges.applyNewConfig(mContext.getResources())) { if (mInterestingConfigChanges.applyNewConfig(mContext.getResources())) {
// If an interesting part of the configuration has changed, we // If an interesting part of the configuration has changed, we
// should completely reload the app entries. // should completely reload the app entries.
for (int i = 0; i < mEntriesMap.size(); i++) { clearEntries();
mEntriesMap.valueAt(i).clear();
}
mAppEntries.clear();
} else { } else {
for (int i=0; i<mAppEntries.size(); i++) { for (int i=0; i<mAppEntries.size(); i++) {
mAppEntries.get(i).sizeStale = true; mAppEntries.get(i).sizeStale = true;
@@ -831,12 +828,23 @@ public class ApplicationsState {
entry.info = info; entry.info = info;
} }
} }
if (mAppEntries.size() > mApplications.size()) {
// There are less apps now, some must have been uninstalled.
clearEntries();
}
mCurComputingSizePkg = null; mCurComputingSizePkg = null;
if (!mBackgroundHandler.hasMessages(BackgroundHandler.MSG_LOAD_ENTRIES)) { if (!mBackgroundHandler.hasMessages(BackgroundHandler.MSG_LOAD_ENTRIES)) {
mBackgroundHandler.sendEmptyMessage(BackgroundHandler.MSG_LOAD_ENTRIES); mBackgroundHandler.sendEmptyMessage(BackgroundHandler.MSG_LOAD_ENTRIES);
} }
} }
private void clearEntries() {
for (int i = 0; i < mEntriesMap.size(); i++) {
mEntriesMap.valueAt(i).clear();
}
mAppEntries.clear();
}
public boolean haveDisabledApps() { public boolean haveDisabledApps() {
return mHaveDisabledApps; return mHaveDisabledApps;
} }
@@ -1179,7 +1187,7 @@ public class ApplicationsState {
int numDone = 0; int numDone = 0;
synchronized (mEntriesMap) { synchronized (mEntriesMap) {
if (DEBUG_LOCKING) Log.v(TAG, "MSG_LOAD_ENTRIES acquired lock"); if (DEBUG_LOCKING) Log.v(TAG, "MSG_LOAD_ENTRIES acquired lock");
for (int i=0; i<mApplications.size() && numDone<6; i++) { for (int i = 0; i < mApplications.size() && numDone < 6; i++) {
if (!mRunning) { if (!mRunning) {
mRunning = true; mRunning = true;
Message m = mMainHandler.obtainMessage( Message m = mMainHandler.obtainMessage(

4
src/com/android/settings/applications/ManageApplications.java
View File

@@ -162,7 +162,6 @@ public class ManageApplications extends InstrumentedFragment
// whether showing system apps. // whether showing system apps.
private boolean mShowSystem; private boolean mShowSystem;
private boolean mHasDisabledApps;
private ApplicationsState mApplicationsState; private ApplicationsState mApplicationsState;
@@ -559,7 +558,6 @@ public class ManageApplications extends InstrumentedFragment
} }
public void setHasDisabled(boolean hasDisabledApps) { public void setHasDisabled(boolean hasDisabledApps) {
mHasDisabledApps = hasDisabledApps;
mFilterAdapter.setFilterEnabled(FILTER_APPS_ENABLED, hasDisabledApps); mFilterAdapter.setFilterEnabled(FILTER_APPS_ENABLED, hasDisabledApps);
mFilterAdapter.setFilterEnabled(FILTER_APPS_DISABLED, hasDisabledApps); mFilterAdapter.setFilterEnabled(FILTER_APPS_DISABLED, hasDisabledApps);
} }
@@ -817,7 +815,7 @@ public class ManageApplications extends InstrumentedFragment
return; return;
} }
mManageApplications.setHasDisabled(hasDisabledApps()); mManageApplications.setHasDisabled(mState.haveDisabledApps());
} }
private void updateLoading() { private void updateLoading() {