diff options
| author | 2017-03-30 18:04:19 +0000 | |
|---|---|---|
| committer | 2017-03-30 18:04:24 +0000 | |
| commit | 257047b24b20182c3d27f4cd1a925c0b633cc03f (patch) | |
| tree | 0ff669f7c47993caac79bcc2886cff6fdf6ba203 | |
| parent | 3b36051cb52f54f3303e211e4b0cd53283ada763 (diff) | |
| parent | 96c1003e1a72ba7d582b0efe79ef5f5993768406 (diff) | |
Merge "Make Notification.EXTRA_ALLOW_DURING_SETUP system API" into oc-dev
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/Notification.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 25bac767ef58..92e2a50b40d5 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5312,6 +5312,7 @@ package android.app { field public static final int DEFAULT_LIGHTS = 4; // 0x4 field public static final int DEFAULT_SOUND = 1; // 0x1 field public static final int DEFAULT_VIBRATE = 2; // 0x2 + field public static final java.lang.String EXTRA_ALLOW_DURING_SETUP = "android.allowDuringSetup"; field public static final java.lang.String EXTRA_AUDIO_CONTENTS_URI = "android.audioContents"; field public static final java.lang.String EXTRA_BACKGROUND_IMAGE_URI = "android.backgroundImageUri"; field public static final java.lang.String EXTRA_BIG_TEXT = "android.bigText"; diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index c78b3cde6fbe..4bbc003cfdfa 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -971,6 +971,7 @@ public class Notification implements Parcelable * Only available to notifications coming from the android package. * @hide */ + @SystemApi public static final String EXTRA_ALLOW_DURING_SETUP = "android.allowDuringSetup"; /** |