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

Switch to new internal API

Browse Source 
Test: atest RunSettingsRoboTests
Change-Id: I2ecfa651031bcb431f28d55512cf93c442686d71
This commit is contained in:
Philip P. Moltmann
2019-08-23 15:58:48 -07:00
parent e7f5837319
commit 0b0a500833
3 changed files with 7 additions and 9 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,6 +28,7 @@ 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;
@@ -618,7 +619,7 @@ public class AppOpsState {
} }
AppOpsManager.OpEntry opEntry = new AppOpsManager.OpEntry( AppOpsManager.OpEntry opEntry = new AppOpsManager.OpEntry(
permOps.get(k), AppOpsManager.MODE_ALLOWED); permOps.get(k), AppOpsManager.MODE_ALLOWED, new Pair[0]);
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()]);

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

@@ -20,6 +20,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.util.Pair;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
@@ -145,7 +146,6 @@ public class MockLocationAppPreferenceControllerTest {
} }
private AppOpsManager.OpEntry createOpEntry(int opMode) { private AppOpsManager.OpEntry createOpEntry(int opMode) {
return new OpEntry(0, false, opMode, null /*accessTimes*/, null /*rejectTimes*/, return new OpEntry(0, opMode, new Pair[0]);
null /*durations*/, null /* proxyUids */, null /* proxyPackages */);
} }
} }

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

@@ -34,6 +34,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.util.Pair;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
@@ -83,14 +84,10 @@ 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, false, AppOpsManager.MODE_ALLOWED, AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, AppOpsManager.MODE_ALLOWED, new Pair[0]));
null /*accessTimes*/, null /*rejectTimes*/, null /*durations*/,
null /* proxyUids */, null /* proxyPackages */));
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, false, AppOpsManager.MODE_IGNORED, AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, AppOpsManager.MODE_IGNORED, new Pair[0]));
null /*accessTimes*/, null /*rejectTimes*/, null /*durations*/,
null /* proxyUids */, null /* proxyPackages */));
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(