Merge "Fix testcase error and UI refresh issue"

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

@@ -80,7 +80,7 @@ public abstract class PowerUsageBase extends DashboardFragment {
         final Bundle bundle = new Bundle();
         bundle.putInt(KEY_REFRESH_TYPE, refreshType);
 
-        LoaderManager.getInstance(this).restartLoader(0, bundle, new PowerLoaderCallback());
+        getLoaderManager().restartLoader(0, bundle, new PowerLoaderCallback());
     }
 
     protected abstract void refreshUi(@BatteryUpdateType int refreshType);

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

@@ -63,10 +63,15 @@ public class RestrictAppPreferenceController extends BasePreferenceController {
     }
 
     @Override
-    public CharSequence getSummary() {
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        mAppInfos = BatteryTipUtils.getRestrictedAppsList(mAppOpsManager, mUserManager);
         final int num = mAppInfos.size();
-        return mContext.getResources().getQuantityString(R.plurals.restricted_app_summary, num,
-                        num);
+        // Fragment change RestrictedAppsList after onPause(), UI needs to be updated in onResume()
+        preference.setVisible(num > 0);
+        preference.setSummary(
+                mContext.getResources().getQuantityString(R.plurals.restricted_app_summary, num,
+                        num));
     }
 
     @Override

tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java

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