Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make Notification.EXTRA_ALLOW_DURING_SETUP system API" into oc-dev

Browse Source
This commit is contained in:
Maurice Lam
2017-03-30 18:04:19 +00:00
committed by Android (Google) Code Review
parent 3b36051cb5 96c1003e1a
commit 257047b24b
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -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";

1
core/java/android/app/Notification.java
View File

@@ -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";
/**