diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-03-25 02:09:43 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-03-25 02:09:43 +0000 |
| commit | b667fca8c42e00f23af3fe2748c76ca185047fc5 (patch) | |
| tree | db25605feb7060c416125a6b299c1f24b962325b | |
| parent | c364f00b7ce4708e9566e485f6085e9281285e50 (diff) | |
| parent | 65cdab3267c984ae09bd8c03bdcbb2d8428c91be (diff) | |
| download | platform_external_robolectric-shadows-b667fca8c42e00f23af3fe2748c76ca185047fc5.tar.gz platform_external_robolectric-shadows-b667fca8c42e00f23af3fe2748c76ca185047fc5.tar.bz2 platform_external_robolectric-shadows-b667fca8c42e00f23af3fe2748c76ca185047fc5.zip | |
Snap for 6329815 from 65cdab3267c984ae09bd8c03bdcbb2d8428c91be to rvc-release
Change-Id: Ie61ac2348e5edef7ebdf6e5dc7b4e39a9bf8fcdd
| -rw-r--r-- | shadows/framework/src/main/java/org/robolectric/shadows/ShadowAppOpsManager.java | 18 |
1 files changed, 18 insertions, 0 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 fba48cf06..04a2f79f7 100644 --- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAppOpsManager.java +++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAppOpsManager.java @@ -132,6 +132,24 @@ public class ShadowAppOpsManager { } // END-INTERNAL + /** + * Like {@link #unsafeCheckOpNoThrow(String, int, String)} but returns the <em>raw</em> mode + * associated with the op. Does not throw a security exception, does not translate {@link + * AppOpsManager#MODE_FOREGROUND}. + */ + @Implementation(minSdk = Q) + protected int unsafeCheckOpRawNoThrow(String op, int uid, String packageName) { + return unsafeCheckOpRawNoThrow(AppOpsManager.strOpToOp(op), uid, packageName); + } + + private int unsafeCheckOpRawNoThrow(int op, int uid, String packageName) { + Integer mode = appModeMap.get(getOpMapKey(uid, packageName, op)); + if (mode == null) { + return AppOpsManager.MODE_ALLOWED; + } + return mode; + } + @Implementation(minSdk = P) @Deprecated // renamed to unsafeCheckOpNoThrow protected int checkOpNoThrow(String op, int uid, String packageName) { |