Merge "Invoke close() method for BatteryUsageStats to close cursor window" into tm-qpr-dev
This commit is contained in:
@@ -169,6 +169,7 @@ public class AppBatteryPreferenceController extends BasePreferenceController
|
|||||||
public void onPause() {
|
public void onPause() {
|
||||||
mParent.getLoaderManager().destroyLoader(
|
mParent.getLoaderManager().destroyLoader(
|
||||||
AppInfoDashboardFragment.LOADER_BATTERY_USAGE_STATS);
|
AppInfoDashboardFragment.LOADER_BATTERY_USAGE_STATS);
|
||||||
|
closeBatteryUsageStats();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void loadBatteryDiffEntries() {
|
private void loadBatteryDiffEntries() {
|
||||||
@@ -292,6 +293,7 @@ public class AppBatteryPreferenceController extends BasePreferenceController
|
|||||||
@Override
|
@Override
|
||||||
public void onLoadFinished(Loader<BatteryUsageStats> loader,
|
public void onLoadFinished(Loader<BatteryUsageStats> loader,
|
||||||
BatteryUsageStats batteryUsageStats) {
|
BatteryUsageStats batteryUsageStats) {
|
||||||
|
closeBatteryUsageStats();
|
||||||
mBatteryUsageStats = batteryUsageStats;
|
mBatteryUsageStats = batteryUsageStats;
|
||||||
AppBatteryPreferenceController.this.onLoadFinished();
|
AppBatteryPreferenceController.this.onLoadFinished();
|
||||||
}
|
}
|
||||||
@@ -300,4 +302,16 @@ public class AppBatteryPreferenceController extends BasePreferenceController
|
|||||||
public void onLoaderReset(Loader<BatteryUsageStats> loader) {
|
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