Merge "Invoke close() method for BatteryUsageStats to close cursor window" (87e404cc) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -161,6 +161,7 @@ public class AppBatteryPreferenceController extends BasePreferenceController
		public void onPause() {
		mParent.getLoaderManager().destroyLoader(
		AppInfoDashboardFragment.LOADER_BATTERY_USAGE_STATS);
		closeBatteryUsageStats();
		}

		private void loadBatteryDiffEntries() {
		@@ -249,6 +250,7 @@ public class AppBatteryPreferenceController extends BasePreferenceController
		@Override
		public void onLoadFinished(Loader<BatteryUsageStats> loader,
		BatteryUsageStats batteryUsageStats) {
		closeBatteryUsageStats();
		mBatteryUsageStats = batteryUsageStats;
		AppBatteryPreferenceController.this.onLoadFinished();
		}
		@@ -257,4 +259,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;
		}
		}
		}
		}