Merge "Invoke close() method for BatteryUsageStats to close cursor window" into tm-qpr-dev

This commit is contained in:
Yanting Yang
2022-11-19 18:33:05 +00:00
committed by Android (Google) Code Review

View File

@@ -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;
}
}
}
}