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

Adjust to changed internal API

Browse Source 
Test: Built
Bug: 144997947
Change-Id: Ib988b85992800223c81e2f729150150ea195a98b
This commit is contained in:
Philip P. Moltmann
2019-11-27 12:42:22 -08:00
parent 5a4e364475
commit cdc8c101eb
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/applications/appops/AppOpsState.java
View File

@@ -28,7 +28,6 @@ import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.util.Log; import android.util.Log;
import android.util.Pair;
import android.util.SparseArray; import android.util.SparseArray;
import com.android.settings.R; import com.android.settings.R;
@@ -619,7 +618,7 @@ public class AppOpsState {
} }
AppOpsManager.OpEntry opEntry = new AppOpsManager.OpEntry( AppOpsManager.OpEntry opEntry = new AppOpsManager.OpEntry(
permOps.get(k), AppOpsManager.MODE_ALLOWED, new Pair[0]); permOps.get(k), AppOpsManager.MODE_ALLOWED, Collections.emptyMap());
dummyOps.add(opEntry); dummyOps.add(opEntry);
addOp(entries, pkgOps, appEntry, opEntry, packageName == null, addOp(entries, pkgOps, appEntry, opEntry, packageName == null,
packageName == null ? 0 : opToOrder[opEntry.getOp()]); packageName == null ? 0 : opToOrder[opEntry.getOp()]);

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) { 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 org.robolectric.RobolectricTestRunner;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@@ -84,10 +85,12 @@ public class RestrictAppPreferenceControllerTest {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
final List<AppOpsManager.OpEntry> allowOps = new ArrayList<>(); final List<AppOpsManager.OpEntry> allowOps = new ArrayList<>();
allowOps.add(new AppOpsManager.OpEntry( 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<>(); final List<AppOpsManager.OpEntry> restrictedOps = new ArrayList<>();
restrictedOps.add(new AppOpsManager.OpEntry( 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( mAllowedPackageOps = new AppOpsManager.PackageOps(
ALLOWED_PACKAGE_NAME, ALLOWED_UID, allowOps); ALLOWED_PACKAGE_NAME, ALLOWED_UID, allowOps);
mRestrictedPackageOps = new AppOpsManager.PackageOps( mRestrictedPackageOps = new AppOpsManager.PackageOps(