summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Christie <dnchrist@google.com>2013-08-07 11:25:12 -0700
committerDavid Christie <dnchrist@google.com>2013-08-07 11:44:54 -0700
commitf45c9a0c6a3572b672ac5e531397516ec1e05c8a (patch)
tree33c6c13178bea3c671bc671b2b2ade7f6b487efd
parente2b1b8e2adcc212f8505bf77a5d7e098d7c12c2f (diff)
downloadframeworks_base-f45c9a0c6a3572b672ac5e531397516ec1e05c8a.zip
frameworks_base-f45c9a0c6a3572b672ac5e531397516ec1e05c8a.tar.gz
frameworks_base-f45c9a0c6a3572b672ac5e531397516ec1e05c8a.tar.bz2
Unhide Context.APP_OPS_SERVICE
Change-Id: Iab3e3fb2a32c3407c61abb694e21d84b50579d4f
-rw-r--r--api/current.txt1
-rw-r--r--core/java/android/content/Context.java2
2 files changed, 1 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index 95f5be8..bf5ea10 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5783,6 +5783,7 @@ package android.content {
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
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 @@ public abstract class Context {
*
* @see #getSystemService
* @see android.app.AppOpsManager
- *
- * @hide
*/
public static final String APP_OPS_SERVICE = "appops";