Merge "Adjust to changed internal API"

This commit is contained in:
Philip P. Moltmann
2019-12-20 03:04:55 +00:00
committed by Android (Google) Code Review
3 changed files with 7 additions and 5 deletions

View File

@@ -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()]);