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

Merge "Adjust to changed internal API"

Browse Source
This commit is contained in:
Philip P. Moltmann
2019-12-20 03:04:55 +00:00
committed by Android (Google) Code Review
parent 4e561fb9cb cdc8c101eb
commit b4e5b0bd78
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java
View File

@@ -146,6 +146,6 @@ public class MockLocationAppPreferenceControllerTest {
}
private AppOpsManager.OpEntry createOpEntry(int opMode) {
return new OpEntry(0, opMode, new Pair[0]);
return new OpEntry(0, opMode, Collections.emptyMap());
}
}

7
tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
View File

@@ -54,6 +54,7 @@ import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
@@ -84,10 +85,12 @@ public class RestrictAppPreferenceControllerTest {
MockitoAnnotations.initMocks(this);
final List<AppOpsManager.OpEntry> allowOps = new ArrayList<>();
allowOps.add(new AppOpsManager.OpEntry(
AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, AppOpsManager.MODE_ALLOWED, new Pair[0]));
AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, AppOpsManager.MODE_ALLOWED,
Collections.emptyMap()));
final List<AppOpsManager.OpEntry> restrictedOps = new ArrayList<>();
restrictedOps.add(new AppOpsManager.OpEntry(
AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, AppOpsManager.MODE_IGNORED, new Pair[0]));
AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, AppOpsManager.MODE_IGNORED,
Collections.emptyMap()));
mAllowedPackageOps = new AppOpsManager.PackageOps(
ALLOWED_PACKAGE_NAME, ALLOWED_UID, allowOps);
mRestrictedPackageOps = new AppOpsManager.PackageOps(