Merge "Invoke close() method for BatteryUsageStats to close cursor window" into tm-qpr-dev am: 06125115a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20514510 Change-Id: If667eaba37c2bf6417053a9477187009ce809efa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -169,6 +169,7 @@ public class AppBatteryPreferenceController extends BasePreferenceController
|
||||
public void onPause() {
|
||||
mParent.getLoaderManager().destroyLoader(
|
||||
AppInfoDashboardFragment.LOADER_BATTERY_USAGE_STATS);
|
||||
closeBatteryUsageStats();
|
||||
}
|
||||
|
||||
private void loadBatteryDiffEntries() {
|
||||
@@ -292,6 +293,7 @@ public class AppBatteryPreferenceController extends BasePreferenceController
|
||||
@Override
|
||||
public void onLoadFinished(Loader<BatteryUsageStats> loader,
|
||||
BatteryUsageStats batteryUsageStats) {
|
||||
closeBatteryUsageStats();
|
||||
mBatteryUsageStats = batteryUsageStats;
|
||||
AppBatteryPreferenceController.this.onLoadFinished();
|
||||
}
|
||||
@@ -300,4 +302,16 @@ public class AppBatteryPreferenceController extends BasePreferenceController
|
||||
public void onLoaderReset(Loader<BatteryUsageStats> loader) {
|
||||
}
|
||||
}
|
||||
|
||||
private void closeBatteryUsageStats() {
|
||||
if (mBatteryUsageStats != null) {
|
||||
try {
|
||||
mBatteryUsageStats.close();
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "BatteryUsageStats.close() failed", e);
|
||||
} finally {
|
||||
mBatteryUsageStats = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user