Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdc8c101 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Adjust to changed internal API 

Test: Built
Bug: 144997947
Change-Id: Ib988b85992800223c81e2f729150150ea195a98b
parent 5a4e3644

src/com/android/settings/applications/appops/AppOpsState.java

+1 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.text.format.DateUtils;

import android.util.Log;

import android.util.Pair;

import android.util.SparseArray;



import com.android.settings.R;
@@ -619,7 +618,7 @@ public class AppOpsState { 


                        }

                        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);

                        addOp(entries, pkgOps, appEntry, opEntry, packageName == null,

                                packageName == null ? 0 : opToOrder[opEntry.getOp()]);

tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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());

    }

}

tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java

+5 −2
Original line number Diff line number Diff line
@@ -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(