commit 9d528a11712f6d1ee32354c182145a7af97f8d69
author Svet Ganov <svetoslavganov@google.com> Wed Dec 19 17:23:11 2018 -0800
committer Svet Ganov <svetoslavganov@google.com> Wed Dec 19 17:25:52 2018 -0800
tree dd61691a2911d9ba79e22244a6916e2a982d2349
parent d692ddf66dc1ccc184a6a6b2fff9aa072d142006

Make sure unsafeCheckOpRaw ops check raw ops

Test: manual

bug:119323172

Change-Id: Ic21d03af3a08bdca76821f2bc644482e7e5a1300

core/java/android/app/AppOpsManagerInternal.java

diff --git a/core/java/android/app/AppOpsManagerInternal.java b/core/java/android/app/AppOpsManagerInternal.java
index 7fe21b2..139a39f 100644
--- a/core/java/android/app/AppOpsManagerInternal.java
+++ b/core/java/android/app/AppOpsManagerInternal.java
@@ -37,10 +37,11 @@
          * @param uid The UID for which to check.
          * @param packageName The package for which to check.
          * @param superImpl The super implementation.
+         * @param raw Whether to check the raw op i.e. not interpret the mode based on UID state.
          * @return The app op check result.
          */
-        int checkOperation(int code, int uid, String packageName,
-                TriFunction<Integer, Integer, String, Integer> superImpl);
+        int checkOperation(int code, int uid, String packageName, boolean raw,
+                QuadFunction<Integer, Integer, String, Boolean, Integer> superImpl);
 
         /**
          * Allows overriding check audio operation behavior.