diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 2 | ||||
| -rw-r--r-- | data/fonts/AndroidEmoji.ttf | bin | 448680 -> 3502396 bytes |
3 files changed, 1 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index a4aa751b794d..6769aa3e8bfa 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 5c37206459f8..81a5e577f3d8 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"; diff --git a/data/fonts/AndroidEmoji.ttf b/data/fonts/AndroidEmoji.ttf Binary files differindex 92bf047b825e..569cbab68f1d 100644 --- a/data/fonts/AndroidEmoji.ttf +++ b/data/fonts/AndroidEmoji.ttf |