commit b97fbc8c5f0cf44e63e97d65956c46b914d64d70
author Peter Visontay <pvisontay@google.com> Thu Dec 21 16:23:55 2017 +0000
committer Peter Visontay <pvisontay@google.com> Fri Jan 05 15:09:01 2018 +0000
tree 3e86d51e4f28d7ed8848a74a0cfc18514ab9f00f
parent 5a2a1ef74a989ef5ac749f0bfbb8f9bc665e7050

Mark AppOpsManager.setMode() @TestApi.

There's a CTS test that accesses this via reflection, which we want to fix: AppOpsTest.testSetMode().

Test: make CtsPermissionTestCases -j32 && cts-tradefed run singleCommand cts-dev -m CtsPermissionTestCases --test android.permission.cts.AppOpsTest
Change-Id: I8e62d55271caaa730c4233f761145f90cc34111c
Bug: 71626306

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index cb4b1e4..b16e700 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -47,6 +47,7 @@
 
   public class AppOpsManager {
     method public static java.lang.String[] getOpStrs();
+    method public void setMode(int, int, java.lang.String, int);
     field public static final java.lang.String OPSTR_ACCESS_NOTIFICATIONS = "android:access_notifications";
     field public static final java.lang.String OPSTR_ACTIVATE_VPN = "android:activate_vpn";
     field public static final java.lang.String OPSTR_ASSIST_SCREENSHOT = "android:assist_screenshot";

core/java/android/app/AppOpsManager.java

diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java
index d32f57a..57f9f67 100644
--- a/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@ -1601,6 +1601,7 @@
     }
 
     /** @hide */
+    @TestApi
     public void setMode(int code, int uid, String packageName, int mode) {
         try {
             mService.setMode(code, uid, packageName, mode);