diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2020-03-13 14:26:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-13 14:26:30 +0000 |
| commit | fff7842626cfa42a7c5afb2b0bbf2716aee9a8e7 (patch) | |
| tree | 92c9ff52634b81383a959241fb1fb950ff56fc87 | |
| parent | 276c0bf1407d7db7fe63c7373307cb6b4440c95b (diff) | |
| parent | b1718b1604e5e1db215b608a746ad1f82cd73447 (diff) | |
| download | platform_external_robolectric-shadows-fff7842626cfa42a7c5afb2b0bbf2716aee9a8e7.tar.gz platform_external_robolectric-shadows-fff7842626cfa42a7c5afb2b0bbf2716aee9a8e7.tar.bz2 platform_external_robolectric-shadows-fff7842626cfa42a7c5afb2b0bbf2716aee9a8e7.zip | |
Merge "Rename featureId -> attributionTag" into rvc-dev
| -rw-r--r-- | shadows/framework/src/main/java/org/robolectric/shadows/ShadowAppOpsManager.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAppOpsManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAppOpsManager.java index 0d89b3b61..fba48cf06 100644 --- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAppOpsManager.java +++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAppOpsManager.java @@ -14,9 +14,9 @@ import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.app.AppOpsManager; +import android.app.AppOpsManager.AttributedOpEntry; import android.app.AppOpsManager.OnOpChangedListener; import android.app.AppOpsManager.OpEntry; -import android.app.AppOpsManager.OpFeatureEntry; import android.app.AppOpsManager.PackageOps; import android.content.Context; import android.content.pm.PackageManager.NameNotFoundException; @@ -25,7 +25,7 @@ import android.os.Binder; import android.os.Build; import android.util.LongSparseArray; import android.util.LongSparseLongArray; -import android.util.Pair; + import com.android.internal.app.IAppOpsService; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -318,7 +318,7 @@ public class ShadowAppOpsManager { rejectEvents.put(key, new AppOpsManager.NoteOpEvent(REJECT_TIME, -1, null)); return new OpEntry(op, AppOpsManager.MODE_ALLOWED, Collections.singletonMap(null, - new OpFeatureEntry(op, false, accessEvents, rejectEvents))); + new AttributedOpEntry(op, false, accessEvents, rejectEvents))); // END-INTERNAL } |