PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use bg appop ALLOWED, not DEFAULT" into oc-dev

Browse Source
This commit is contained in:
Chris Tate
2017-04-12 18:58:26 +00:00
committed by Android (Google) Code Review
parent aa3685fe14 65cb0d6488
commit 763bfea530
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
View File

@@ -90,12 +90,16 @@ public class BackgroundActivityPreferenceController extends PreferenceController
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
boolean switchOn = (Boolean) newValue; boolean switchOn = (Boolean) newValue;
mAppOpsManager.setUidMode(AppOpsManager.OP_RUN_IN_BACKGROUND, mUid, mAppOpsManager.setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, mUid, mTargetPackage,
switchOn ? AppOpsManager.MODE_DEFAULT : AppOpsManager.MODE_IGNORED); switchOn ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED);
return true; return true;
} }
@VisibleForTesting
String getTargetPackage() {
return mTargetPackage;
}
@VisibleForTesting @VisibleForTesting
boolean isLegacyApp(final String packageName) { boolean isLegacyApp(final String packageName) {
try { try {

10
tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
View File

@@ -85,16 +85,16 @@ public class BackgroundActivityPreferenceControllerTest {
public void testOnPreferenceChange_TurnOnCheck_MethodInvoked() { public void testOnPreferenceChange_TurnOnCheck_MethodInvoked() {
mController.onPreferenceChange(mPreference, true); mController.onPreferenceChange(mPreference, true);
verify(mAppOpsManager).setUidMode(AppOpsManager.OP_RUN_IN_BACKGROUND, verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_NORMAL,
UID_NORMAL, AppOpsManager.MODE_DEFAULT); mController.getTargetPackage(), AppOpsManager.MODE_ALLOWED);
} }
@Test @Test
public void testOnPreferenceChange_TurnOffCheck_MethodInvoked() { public void testOnPreferenceChange_TurnOffCheck_MethodInvoked() {
mController.onPreferenceChange(null, false); mController.onPreferenceChange(null, false);
verify(mAppOpsManager).setUidMode(AppOpsManager.OP_RUN_IN_BACKGROUND, verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_NORMAL,
UID_NORMAL, AppOpsManager.MODE_IGNORED); mController.getTargetPackage(), AppOpsManager.MODE_IGNORED);
} }
@Test @Test
@@ -134,7 +134,7 @@ public class BackgroundActivityPreferenceControllerTest {
mController = new BackgroundActivityPreferenceController(mContext, UID_SPECIAL); mController = new BackgroundActivityPreferenceController(mContext, UID_SPECIAL);
when(mAppOpsManager when(mAppOpsManager
.checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_SPECIAL, LOW_SDK_PACKAGE)) .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_SPECIAL, LOW_SDK_PACKAGE))
.thenReturn(AppOpsManager.MODE_DEFAULT); .thenReturn(AppOpsManager.MODE_ALLOWED);
when(mAppOpsManager when(mAppOpsManager
.checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_SPECIAL, HIGH_SDK_PACKAGE)) .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_SPECIAL, HIGH_SDK_PACKAGE))
.thenReturn(AppOpsManager.MODE_IGNORED); .thenReturn(AppOpsManager.MODE_IGNORED);