Merge "Restart loader in onResume" into oc-dev

This commit is contained in:
Lei Yu
2017-06-02 19:21:27 +00:00
committed by Android (Google) Code Review
2 changed files with 25 additions and 4 deletions

View File

@@ -144,7 +144,8 @@ public class InstalledAppDetails extends AppInfoBase
private static final int LOADER_CHART_DATA = 2;
private static final int LOADER_STORAGE = 3;
private static final int LOADER_BATTERY = 4;
@VisibleForTesting
static final int LOADER_BATTERY = 4;
private static final int DLG_FORCE_STOP = DLG_BASE + 1;
private static final int DLG_DISABLE = DLG_BASE + 2;
@@ -207,7 +208,8 @@ public class InstalledAppDetails extends AppInfoBase
private AppStorageStats mLastResult;
private String mBatteryPercent;
private final LoaderCallbacks<BatteryStatsHelper> mBatteryCallbacks =
@VisibleForTesting
final LoaderCallbacks<BatteryStatsHelper> mBatteryCallbacks =
new LoaderCallbacks<BatteryStatsHelper>() {
@Override
@@ -415,11 +417,16 @@ public class InstalledAppDetails extends AppInfoBase
mDataCallbacks);
loaderManager.restartLoader(LOADER_STORAGE, Bundle.EMPTY, this);
}
getLoaderManager().initLoader(LOADER_BATTERY, Bundle.EMPTY, mBatteryCallbacks);
restartBatteryStatsLoader();
new MemoryUpdater().execute();
updateDynamicPrefs();
}
@VisibleForTesting
public void restartBatteryStatsLoader() {
getLoaderManager().restartLoader(LOADER_BATTERY, Bundle.EMPTY, mBatteryCallbacks);
}
@Override
public void onPause() {
getLoaderManager().destroyLoader(LOADER_CHART_DATA);