commit eb2e139b38eb740e06b691a6a8b690251377095e
author David Christie <dnchrist@google.com> Wed Aug 07 22:44:36 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 07 22:44:36 2013 +0000
tree 30f6ec4db384ff2568e200a994107f5ed0869a4d
parent 18ec40c44c936fd5146133ccc7446a4cd860b527
parent f45c9a0c6a3572b672ac5e531397516ec1e05c8a

Merge "Unhide Context.APP_OPS_SERVICE"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index a4aa751..6769aa3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5783,6 +5783,7 @@
     field public static final java.lang.String ACCOUNT_SERVICE = "account";
     field public static final java.lang.String ACTIVITY_SERVICE = "activity";
     field public static final java.lang.String ALARM_SERVICE = "alarm";
+    field public static final java.lang.String APP_OPS_SERVICE = "appops";
     field public static final java.lang.String AUDIO_SERVICE = "audio";
     field public static final int BIND_ABOVE_CLIENT = 8; // 0x8
     field public static final int BIND_ADJUST_WITH_ACTIVITY = 128; // 0x80

core/java/android/content/Context.java

diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 5c37206..81a5e57 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -2285,8 +2285,6 @@
      *
      * @see #getSystemService
      * @see android.app.AppOpsManager
-     *
-     * @hide
      */
     public static final String APP_OPS_SERVICE = "appops";