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

Commit d1ac6015 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert the DISMISSAL_NOT_DISMISSED to previous value."

parents ed037dbf 3f4d5465

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4752,7 +4752,7 @@ package android.service.notification { 
    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.service.notification.NotificationStats> CREATOR;

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

    field public static final int DISMISSAL_NOT_DISMISSED = -1000; // 0xfffffc18

    field public static final int DISMISSAL_NOT_DISMISSED = -1; // 0xffffffff

    field public static final int DISMISSAL_OTHER = 0; // 0x0

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

    field public static final int DISMISSAL_SHADE = 3; // 0x3

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1125,7 +1125,7 @@ package android.service.notification { 
    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.service.notification.NotificationStats> CREATOR;

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

    field public static final int DISMISSAL_NOT_DISMISSED = -1000; // 0xfffffc18

    field public static final int DISMISSAL_NOT_DISMISSED = -1; // 0xffffffff

    field public static final int DISMISSAL_OTHER = 0; // 0x0

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

    field public static final int DISMISSAL_SHADE = 3; // 0x3

core/java/android/service/notification/NotificationStats.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public final class NotificationStats implements Parcelable { 
    /**

     * Notification has not been dismissed yet.

     */

    public static final int DISMISSAL_NOT_DISMISSED = -1000;

    public static final int DISMISSAL_NOT_DISMISSED = -1;

    /**

     * Notification has been dismissed from a {@link NotificationListenerService} or the app

     * itself.