Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c61bd0f authored by Maurice Lam's avatar Maurice Lam Committed by android-build-merger
Browse files

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

am: 257047b2

Change-Id: I2c2efe34719c14cd3fc3ff55f91917a2141218d3
parents 74fe1c50 257047b2

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -5312,6 +5312,7 @@ package android.app { 
    field public static final int DEFAULT_LIGHTS = 4; // 0x4

    field public static final int DEFAULT_LIGHTS = 4; // 0x4

    field public static final int DEFAULT_SOUND = 1; // 0x1

    field public static final int DEFAULT_SOUND = 1; // 0x1

    field public static final int DEFAULT_VIBRATE = 2; // 0x2

    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_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_BACKGROUND_IMAGE_URI = "android.backgroundImageUri";

    field public static final java.lang.String EXTRA_BIG_TEXT = "android.bigText";

    field public static final java.lang.String EXTRA_BIG_TEXT = "android.bigText";

core/java/android/app/Notification.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -971,6 +971,7 @@ public class Notification implements Parcelable 
     * Only available to notifications coming from the android package.

     * Only available to notifications coming from the android package.

     * @hide

     * @hide

     */

     */

    @SystemApi

    public static final String EXTRA_ALLOW_DURING_SETUP = "android.allowDuringSetup";

    public static final String EXTRA_ALLOW_DURING_SETUP = "android.allowDuringSetup";





    /**

    /**