Merge "Fix bugs in auto restriction." into pi-dev
diff --git a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java
index 7fdf829..6acd2ba 100644
--- a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java
@@ -43,7 +43,6 @@
@VisibleForTesting
List<AppInfo> mAppInfos;
private AppOpsManager mAppOpsManager;
- private SettingsActivity mSettingsActivity;
private InstrumentedPreferenceFragment mPreferenceFragment;
private UserManager mUserManager;
@@ -53,10 +52,8 @@
mUserManager = context.getSystemService(UserManager.class);
}
- public RestrictAppPreferenceController(SettingsActivity settingsActivity,
- InstrumentedPreferenceFragment preferenceFragment) {
- this(settingsActivity.getApplicationContext());
- mSettingsActivity = settingsActivity;
+ public RestrictAppPreferenceController(InstrumentedPreferenceFragment preferenceFragment) {
+ this(preferenceFragment.getContext());
mPreferenceFragment = preferenceFragment;
}
@@ -83,7 +80,7 @@
public boolean handlePreferenceTreeClick(Preference preference) {
if (getPreferenceKey().equals(preference.getKey())) {
// start fragment
- RestrictedAppDetails.startRestrictedAppDetails(mSettingsActivity, mPreferenceFragment,
+ RestrictedAppDetails.startRestrictedAppDetails(mPreferenceFragment,
mAppInfos);
return true;
}
diff --git a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
index 96fafb3..23b4067 100644
--- a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
+++ b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
@@ -67,12 +67,12 @@
private final FooterPreferenceMixin mFooterPreferenceMixin =
new FooterPreferenceMixin(this, getLifecycle());
- public static void startRestrictedAppDetails(SettingsActivity caller,
- InstrumentedPreferenceFragment fragment, List<AppInfo> appInfos) {
+ public static void startRestrictedAppDetails(InstrumentedPreferenceFragment fragment,
+ List<AppInfo> appInfos) {
final Bundle args = new Bundle();
args.putParcelableList(EXTRA_APP_INFO_LIST, appInfos);
- new SubSettingLauncher(caller)
+ new SubSettingLauncher(fragment.getContext())
.setDestination(RestrictedAppDetails.class.getName())
.setArguments(args)
.setTitle(R.string.restricted_app_title)
diff --git a/src/com/android/settings/fuelgauge/SmartBatterySettings.java b/src/com/android/settings/fuelgauge/SmartBatterySettings.java
index bcbac3f..5e63976 100644
--- a/src/com/android/settings/fuelgauge/SmartBatterySettings.java
+++ b/src/com/android/settings/fuelgauge/SmartBatterySettings.java
@@ -71,7 +71,7 @@
controllers.add(new SmartBatteryPreferenceController(context));
if (settingsActivity != null && fragment != null) {
controllers.add(
- new RestrictAppPreferenceController(settingsActivity, fragment));
+ new RestrictAppPreferenceController(fragment));
} else {
controllers.add(new RestrictAppPreferenceController(context));
}
diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
index 518b633..7f6eb9b 100644
--- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
+++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
@@ -100,6 +100,7 @@
.getFactory(this).getPowerUsageFeatureProvider(this);
final MetricsFeatureProvider metricsFeatureProvider = FeatureFactory
.getFactory(this).getMetricsFeatureProvider();
+ batteryUtils.initBatteryStatsHelper(batteryStatsHelper, null /* bundle */, userManager);
for (JobWorkItem item = params.dequeueWork(); item != null;
item = params.dequeueWork()) {
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
index 1f79e7c..be25518 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
@@ -101,8 +101,7 @@
}
case BatteryTip.TipType.APP_RESTRICTION:
if (batteryTip.getState() == BatteryTip.StateType.HANDLED) {
- return new OpenRestrictAppFragmentAction(settingsActivity, fragment,
- (RestrictAppTip) batteryTip);
+ return new OpenRestrictAppFragmentAction(fragment, (RestrictAppTip) batteryTip);
} else {
return new RestrictAppAction(settingsActivity, (RestrictAppTip) batteryTip);
}
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java
index afb80f2..f9fb949 100644
--- a/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java
@@ -16,15 +16,16 @@
package com.android.settings.fuelgauge.batterytip.actions;
-import android.app.Fragment;
+import android.support.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsActivity;
import com.android.settings.core.InstrumentedPreferenceFragment;
-import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.fuelgauge.RestrictedAppDetails;
+import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper;
import com.android.settings.fuelgauge.batterytip.AppInfo;
+import com.android.settings.fuelgauge.batterytip.BatteryDatabaseManager;
import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
+import com.android.settingslib.utils.ThreadUtils;
import java.util.List;
@@ -33,17 +34,16 @@
*/
public class OpenRestrictAppFragmentAction extends BatteryTipAction {
private final RestrictAppTip mRestrictAppTip;
- private final BatteryUtils mBatteryUtils;
- private final SettingsActivity mSettingsActivity;
private final InstrumentedPreferenceFragment mFragment;
+ @VisibleForTesting
+ BatteryDatabaseManager mBatteryDatabaseManager;
- public OpenRestrictAppFragmentAction(SettingsActivity settingsActivity,
- InstrumentedPreferenceFragment fragment, RestrictAppTip tip) {
+ public OpenRestrictAppFragmentAction(InstrumentedPreferenceFragment fragment,
+ RestrictAppTip tip) {
super(fragment.getContext());
- mSettingsActivity = settingsActivity;
mFragment = fragment;
mRestrictAppTip = tip;
- mBatteryUtils = BatteryUtils.getInstance(mContext);
+ mBatteryDatabaseManager = BatteryDatabaseManager.getInstance(mContext);
}
/**
@@ -54,7 +54,10 @@
mMetricsFeatureProvider.action(mContext,
MetricsProto.MetricsEvent.ACTION_TIP_OPEN_APP_RESTRICTION_PAGE, metricsKey);
final List<AppInfo> mAppInfos = mRestrictAppTip.getRestrictAppList();
- RestrictedAppDetails.startRestrictedAppDetails(mSettingsActivity, mFragment,
- mAppInfos);
+ RestrictedAppDetails.startRestrictedAppDetails(mFragment, mAppInfos);
+
+ // Mark all the anomalies as handled, so it won't show up again.
+ ThreadUtils.postOnBackgroundThread(() -> mBatteryDatabaseManager.updateAnomalies(mAppInfos,
+ AnomalyDatabaseHelper.State.HANDLED));
}
}
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java
index 5a640e5..aacacc5 100644
--- a/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java
@@ -20,18 +20,17 @@
import android.support.annotation.VisibleForTesting;
import android.text.format.DateUtils;
-import com.android.settings.Utils;
import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper;
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settings.fuelgauge.batterytip.BatteryDatabaseManager;
import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
-import com.android.settings.fuelgauge.batterytip.tips.AppInfoPredicate;
+import com.android.settings.fuelgauge.batterytip.tips.AppLabelPredicate;
+import com.android.settings.fuelgauge.batterytip.tips.AppRestrictionPredicate;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
import java.util.ArrayList;
import java.util.List;
-import java.util.function.Predicate;
/**
* Detector whether to show summary tip. This detector should be executed as the last
@@ -45,13 +44,15 @@
BatteryDatabaseManager mBatteryDatabaseManager;
private Context mContext;
- private AppInfoPredicate mAppInfoPredicate;
+ private AppRestrictionPredicate mAppRestrictionPredicate;
+ private AppLabelPredicate mAppLabelPredicate;
public RestrictAppDetector(Context context, BatteryTipPolicy policy) {
mContext = context;
mPolicy = policy;
mBatteryDatabaseManager = BatteryDatabaseManager.getInstance(context);
- mAppInfoPredicate = new AppInfoPredicate(context);
+ mAppRestrictionPredicate = new AppRestrictionPredicate(context);
+ mAppLabelPredicate = new AppLabelPredicate(context);
}
@Override
@@ -64,7 +65,8 @@
final long oneDayBeforeMs = System.currentTimeMillis() - DateUtils.DAY_IN_MILLIS;
final List<AppInfo> highUsageApps = mBatteryDatabaseManager.queryAllAnomalies(
oneDayBeforeMs, AnomalyDatabaseHelper.State.NEW);
- highUsageApps.removeIf(mAppInfoPredicate);
+ // Remove it if it doesn't have label or been restricted
+ highUsageApps.removeIf(mAppLabelPredicate.or(mAppRestrictionPredicate));
if (!highUsageApps.isEmpty()) {
// If there are new anomalies, show them
return new RestrictAppTip(BatteryTip.StateType.NEW, highUsageApps);
@@ -72,7 +74,8 @@
// Otherwise, show auto-handled one if it exists
final List<AppInfo> autoHandledApps = mBatteryDatabaseManager.queryAllAnomalies(
oneDayBeforeMs, AnomalyDatabaseHelper.State.AUTO_HANDLED);
- autoHandledApps.removeIf(mAppInfoPredicate);
+ // Remove it if it doesn't have label or unrestricted
+ autoHandledApps.removeIf(mAppLabelPredicate.or(mAppRestrictionPredicate.negate()));
return new RestrictAppTip(autoHandledApps.isEmpty() ? BatteryTip.StateType.INVISIBLE
: BatteryTip.StateType.HANDLED, autoHandledApps);
}
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/AppInfoPredicate.java b/src/com/android/settings/fuelgauge/batterytip/tips/AppLabelPredicate.java
similarity index 76%
rename from src/com/android/settings/fuelgauge/batterytip/tips/AppInfoPredicate.java
rename to src/com/android/settings/fuelgauge/batterytip/tips/AppLabelPredicate.java
index df78caa..13a2452 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/AppInfoPredicate.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/AppLabelPredicate.java
@@ -25,22 +25,20 @@
import java.util.function.Predicate;
/**
- * {@link Predicate} for {@link AppInfo} to check whether it has label or restricted.
+ * {@link Predicate} for {@link AppInfo} to check whether it has label
*/
-public class AppInfoPredicate implements Predicate<AppInfo> {
+public class AppLabelPredicate implements Predicate<AppInfo> {
private Context mContext;
private AppOpsManager mAppOpsManager;
- public AppInfoPredicate(Context context) {
+ public AppLabelPredicate(Context context) {
mContext = context;
mAppOpsManager = context.getSystemService(AppOpsManager.class);
}
@Override
public boolean test(AppInfo appInfo) {
- // Return true if app doesn't have label or already been restricted
- return Utils.getApplicationLabel(mContext, appInfo.packageName) == null
- || mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND,
- appInfo.uid, appInfo.packageName) == AppOpsManager.MODE_IGNORED;
+ // Return true if app doesn't have label
+ return Utils.getApplicationLabel(mContext, appInfo.packageName) == null;
}
}
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/AppInfoPredicate.java b/src/com/android/settings/fuelgauge/batterytip/tips/AppRestrictionPredicate.java
similarity index 69%
copy from src/com/android/settings/fuelgauge/batterytip/tips/AppInfoPredicate.java
copy to src/com/android/settings/fuelgauge/batterytip/tips/AppRestrictionPredicate.java
index df78caa..21bdbf1 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/AppInfoPredicate.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/AppRestrictionPredicate.java
@@ -25,22 +25,19 @@
import java.util.function.Predicate;
/**
- * {@link Predicate} for {@link AppInfo} to check whether it has label or restricted.
+ * {@link Predicate} for {@link AppInfo} to check whether it is restricted.
*/
-public class AppInfoPredicate implements Predicate<AppInfo> {
- private Context mContext;
+public class AppRestrictionPredicate implements Predicate<AppInfo> {
private AppOpsManager mAppOpsManager;
- public AppInfoPredicate(Context context) {
- mContext = context;
+ public AppRestrictionPredicate(Context context) {
mAppOpsManager = context.getSystemService(AppOpsManager.class);
}
@Override
public boolean test(AppInfo appInfo) {
- // Return true if app doesn't have label or already been restricted
- return Utils.getApplicationLabel(mContext, appInfo.packageName) == null
- || mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND,
+ // Return true if app already been restricted
+ return mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND,
appInfo.uid, appInfo.packageName) == AppOpsManager.MODE_IGNORED;
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
index 7d26755..bf1e887 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
@@ -67,8 +67,6 @@
@Mock
private AppOpsManager.PackageOps mOtherUserPackageOps;
@Mock
- private SettingsActivity mSettingsActivity;
- @Mock
private InstrumentedPreferenceFragment mFragment;
@Mock
private UserManager mUserManager;
@@ -102,9 +100,9 @@
mContext = spy(RuntimeEnvironment.application);
doReturn(mAppOpsManager).when(mContext).getSystemService(Context.APP_OPS_SERVICE);
doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
- doReturn(mContext).when(mSettingsActivity).getApplicationContext();
+ doReturn(mContext).when(mFragment).getContext();
mRestrictAppPreferenceController =
- new RestrictAppPreferenceController(mSettingsActivity, mFragment);
+ new RestrictAppPreferenceController(mFragment);
mPackageOpsList = new ArrayList<>();
mPreference = new Preference(mContext);
mPreference.setKey(mRestrictAppPreferenceController.getPreferenceKey());
@@ -171,7 +169,7 @@
mRestrictAppPreferenceController.handlePreferenceTreeClick(mPreference);
- verify(mSettingsActivity).startActivity(intent.capture());
+ verify(mContext).startActivity(intent.capture());
assertThat(intent.getValue().getStringExtra(EXTRA_SHOW_FRAGMENT))
.isEqualTo(RestrictedAppDetails.class.getName());
assertThat(intent.getValue().getIntExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, -1))
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
index 0fad0a7..04ba246 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
@@ -69,8 +69,6 @@
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private PreferenceManager mPreferenceManager;
@Mock
- private SettingsActivity mSettingsActivity;
- @Mock
private InstrumentedPreferenceFragment mFragment;
private RestrictedAppDetails mRestrictedAppDetails;
private Context mContext;
@@ -90,6 +88,7 @@
doReturn(mPreferenceManager).when(mRestrictedAppDetails).getPreferenceManager();
doReturn(mContext).when(mPreferenceManager).getContext();
+ doReturn(mContext).when(mFragment).getContext();
mRestrictedAppDetails.mPackageManager = mPackageManager;
mRestrictedAppDetails.mIconDrawableFactory = mIconDrawableFactory;
mRestrictedAppDetails.mAppInfos = new ArrayList<>();
@@ -124,9 +123,9 @@
// Get the intent in which it has the app info bundle
mIntent = captor.getValue();
return true;
- }).when(mSettingsActivity).startActivity(captor.capture());
+ }).when(mContext).startActivity(captor.capture());
- RestrictedAppDetails.startRestrictedAppDetails(mSettingsActivity, mFragment,
+ RestrictedAppDetails.startRestrictedAppDetails(mFragment,
mRestrictedAppDetails.mAppInfos);
final Bundle bundle = mIntent.getBundleExtra(
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java
new file mode 100644
index 0000000..39555b2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.fuelgauge.batterytip.actions;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.core.InstrumentedPreferenceFragment;
+import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper;
+import com.android.settings.fuelgauge.batterytip.AppInfo;
+import com.android.settings.fuelgauge.batterytip.BatteryDatabaseManager;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
+import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
+import com.android.settings.testutils.DatabaseTestUtils;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class OpenRestrictAppFragmentActionTest {
+
+ private static final String PACKAGE_NAME_1 = "com.android.app1";
+ private static final String PACKAGE_NAME_2 = "com.android.app2";
+ private static final int ANOMALY_WAKEUP = 0;
+ private static final int ANOMALY_BT = 1;
+ private static final int METRICS_KEY = 1;
+
+ @Mock
+ private InstrumentedPreferenceFragment mFragment;
+ @Mock
+ private BatteryDatabaseManager mBatteryDatabaseManager;
+ private OpenRestrictAppFragmentAction mAction;
+ private FakeFeatureFactory mFeatureFactory;
+ private Context mContext;
+ private List<AppInfo> mAppInfos;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+
+ mAppInfos = new ArrayList<>();
+ mAppInfos.add(new AppInfo.Builder()
+ .setPackageName(PACKAGE_NAME_1)
+ .addAnomalyType(ANOMALY_BT)
+ .build());
+ mAppInfos.add(new AppInfo.Builder()
+ .setPackageName(PACKAGE_NAME_2)
+ .addAnomalyType(ANOMALY_WAKEUP)
+ .build());
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
+ when(mFragment.getContext()).thenReturn(mContext);
+
+ mAction = new OpenRestrictAppFragmentAction(mFragment,
+ new RestrictAppTip(BatteryTip.StateType.HANDLED, mAppInfos));
+ mAction.mBatteryDatabaseManager = mBatteryDatabaseManager;
+ }
+
+ @After
+ public void cleanUp() {
+ DatabaseTestUtils.clearDb(mContext);
+ }
+
+ @Test
+ public void testHandlePositiveAction() {
+ mAction.handlePositiveAction(METRICS_KEY);
+
+ verify(mFeatureFactory.metricsFeatureProvider).action(mContext,
+ MetricsProto.MetricsEvent.ACTION_TIP_OPEN_APP_RESTRICTION_PAGE, METRICS_KEY);
+ verify(mBatteryDatabaseManager).updateAnomalies(mAppInfos,
+ AnomalyDatabaseHelper.State.HANDLED);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java
index 76e2928..a8989a0 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java
@@ -55,9 +55,11 @@
public class RestrictAppDetectorTest {
private static final int RESTRICTED_UID = 222;
+ private static final int UNRESTRICTED_UID = 333;
private static final String PACKAGE_NAME = "com.android.app";
private static final String UNINSTALLED_PACKAGE_NAME = "com.android.uninstalled";
private static final String RESTRICTED_PACKAGE_NAME = "com.android.restricted";
+ private static final String UNRESTRICTED_PACKAGE_NAME = "com.android.unrestricted";
private Context mContext;
private BatteryTipPolicy mPolicy;
private RestrictAppDetector mRestrictAppDetector;
@@ -88,9 +90,12 @@
doReturn(mAppOpsManager).when(mContext).getSystemService(AppOpsManager.class);
doReturn(AppOpsManager.MODE_IGNORED).when(mAppOpsManager).checkOpNoThrow(
AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, RESTRICTED_UID, RESTRICTED_PACKAGE_NAME);
+ doReturn(AppOpsManager.MODE_ALLOWED).when(mAppOpsManager).checkOpNoThrow(
+ AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UNRESTRICTED_UID,
+ UNRESTRICTED_PACKAGE_NAME);
doReturn(mPackageManager).when(mContext).getPackageManager();
- doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(eq(PACKAGE_NAME),
+ doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(any(),
anyInt());
doReturn(PACKAGE_NAME).when(mApplicationInfo).loadLabel(any());
doThrow(new PackageManager.NameNotFoundException()).when(
@@ -116,6 +121,10 @@
@Test
public void testDetect_hasAutoHandledAnomaly_tipHandled() {
+ mAppInfoList.add(new AppInfo.Builder()
+ .setUid(RESTRICTED_UID)
+ .setPackageName(RESTRICTED_PACKAGE_NAME)
+ .build());
doReturn(new ArrayList<AppInfo>()).when(mBatteryDatabaseManager)
.queryAllAnomalies(anyLong(), eq(AnomalyDatabaseHelper.State.NEW));
doReturn(mAppInfoList).when(mBatteryDatabaseManager)
@@ -126,7 +135,7 @@
}
@Test
- public void testDetect_hasUninstalledAnomaly_removeIt() {
+ public void testDetect_typeNewHasUninstalledAnomaly_removeIt() {
mAppInfoList.add(new AppInfo.Builder()
.setPackageName(UNINSTALLED_PACKAGE_NAME)
.build());
@@ -139,7 +148,7 @@
}
@Test
- public void testDetect_hasRestrictedAnomaly_removeIt() throws
+ public void testDetect_typeNewHasRestrictedAnomaly_removeIt() throws
PackageManager.NameNotFoundException {
mAppInfoList.add(new AppInfo.Builder()
.setUid(RESTRICTED_UID)
@@ -156,6 +165,25 @@
}
@Test
+ public void testDetect_typeHandledHasUnRestrictedAnomaly_removeIt() throws
+ PackageManager.NameNotFoundException {
+ mAppInfoList.clear();
+ mAppInfoList.add(new AppInfo.Builder()
+ .setUid(UNRESTRICTED_UID)
+ .setPackageName(UNRESTRICTED_PACKAGE_NAME)
+ .build());
+ doReturn(new ArrayList<>()).when(mBatteryDatabaseManager)
+ .queryAllAnomalies(anyLong(), eq(AnomalyDatabaseHelper.State.NEW));
+ doReturn(mAppInfoList).when(mBatteryDatabaseManager)
+ .queryAllAnomalies(anyLong(), eq(AnomalyDatabaseHelper.State.AUTO_HANDLED));
+ doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(
+ eq(UNRESTRICTED_PACKAGE_NAME), anyInt());
+
+ final RestrictAppTip restrictAppTip = (RestrictAppTip) mRestrictAppDetector.detect();
+ assertThat(restrictAppTip.getState()).isEqualTo(BatteryTip.StateType.INVISIBLE);
+ }
+
+ @Test
public void testDetect_noAnomaly_tipInvisible() {
doReturn(new ArrayList<AppInfo>()).when(mBatteryDatabaseManager)
.queryAllAnomalies(anyLong(), anyInt());
diff --git a/tests/unit/src/com/android/settings/fuelgauge/batterytip/RestrictAppTest.java b/tests/unit/src/com/android/settings/fuelgauge/batterytip/RestrictAppTest.java
index b3842d2..5d68c76 100644
--- a/tests/unit/src/com/android/settings/fuelgauge/batterytip/RestrictAppTest.java
+++ b/tests/unit/src/com/android/settings/fuelgauge/batterytip/RestrictAppTest.java
@@ -55,7 +55,7 @@
}
@Test
- public void testBatterySettings_hasOneAnomaly_showAnomaly() throws
+ public void batterySettings_hasOneAnomaly_showAnomaly() throws
PackageManager.NameNotFoundException {
mBatteryDatabaseManager.insertAnomaly(mPackageManager.getPackageUid(PACKAGE_SETTINGS, 0),
PACKAGE_SETTINGS, 1,
@@ -67,7 +67,7 @@
}
@Test
- public void testBatterySettings_hasTwoAnomalies_showAnomalies() throws
+ public void batterySettings_hasTwoAnomalies_showAnomalies() throws
PackageManager.NameNotFoundException {
mBatteryDatabaseManager.insertAnomaly(mPackageManager.getPackageUid(PACKAGE_SETTINGS, 0),
PACKAGE_SETTINGS, 1,
@@ -80,4 +80,19 @@
instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
onView(withText("Restrict 2 apps")).check(matches(isDisplayed()));
}
+
+ @Test
+ public void batterySettings_hasAutoHandledAnomalies_showAutoHandled() throws
+ PackageManager.NameNotFoundException {
+ mBatteryDatabaseManager.insertAnomaly(mPackageManager.getPackageUid(PACKAGE_SETTINGS, 0),
+ PACKAGE_SETTINGS, 1,
+ AnomalyDatabaseHelper.State.AUTO_HANDLED, System.currentTimeMillis());
+ mBatteryDatabaseManager.insertAnomaly(mPackageManager.getPackageUid(PACKAGE_SYSTEM_UI, 0),
+ PACKAGE_SYSTEM_UI, 1,
+ AnomalyDatabaseHelper.State.AUTO_HANDLED, System.currentTimeMillis());
+
+ Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+ instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
+ onView(withText("2 apps recently restricted")).check(matches(isDisplayed()));
+ }
}