Merge "Fix Battery usage page refresh issue" (e90244ba) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/fuelgauge/PowerUsageBase.java

+3 −8

Original line number	Diff line number	Diff line
		@@ -67,17 +67,12 @@ public abstract class PowerUsageBase extends DashboardFragment {
		@Override
		public void onStart() {
		super.onStart();
		}

		@Override
		public void onResume() {
		super.onResume();
		mBatteryBroadcastReceiver.register();
		}

		@Override
		public void onPause() {
		super.onPause();
		public void onStop() {
		super.onStop();
		mBatteryBroadcastReceiver.unRegister();
		}

		@@ -85,7 +80,7 @@ public abstract class PowerUsageBase extends DashboardFragment {
		final Bundle bundle = new Bundle();
		bundle.putInt(KEY_REFRESH_TYPE, refreshType);

		getLoaderManager().restartLoader(0, bundle, new PowerLoaderCallback());
		LoaderManager.getInstance(this).restartLoader(0, bundle, new PowerLoaderCallback());
		}

		protected abstract void refreshUi(@BatteryUpdateType int refreshType);

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ public class PowerUsageBaseTest {

		mFragment = spy(new TestFragment());
		mFragment.setBatteryStatsHelper(mBatteryStatsHelper);
		doReturn(mLoaderManager).when(mFragment).getLoaderManager();
		doReturn(mLoaderManager).when(LoaderManager.getInstance(any()));
		}

		@Test