Merge "Fix Battery usage page refresh issue"

This commit is contained in:
TreeHugger Robot
2019-09-05 17:14:15 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 9 deletions

View File

@@ -67,17 +67,12 @@ public abstract class PowerUsageBase extends DashboardFragment {
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
}
@Override
public void onResume() {
super.onResume();
mBatteryBroadcastReceiver.register(); mBatteryBroadcastReceiver.register();
} }
@Override @Override
public void onPause() { public void onStop() {
super.onPause(); super.onStop();
mBatteryBroadcastReceiver.unRegister(); mBatteryBroadcastReceiver.unRegister();
} }
@@ -85,7 +80,7 @@ public abstract class PowerUsageBase extends DashboardFragment {
final Bundle bundle = new Bundle(); final Bundle bundle = new Bundle();
bundle.putInt(KEY_REFRESH_TYPE, refreshType); 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); protected abstract void refreshUi(@BatteryUpdateType int refreshType);

View File

@@ -57,7 +57,7 @@ public class PowerUsageBaseTest {
mFragment = spy(new TestFragment()); mFragment = spy(new TestFragment());
mFragment.setBatteryStatsHelper(mBatteryStatsHelper); mFragment.setBatteryStatsHelper(mBatteryStatsHelper);
doReturn(mLoaderManager).when(mFragment).getLoaderManager(); doReturn(mLoaderManager).when(LoaderManager.getInstance(any()));
} }
@Test @Test