commit d1ac6015a6a72e7950e503494467e3c944fc9459
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Aug 23 00:34:21 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 23 00:34:21 2018 +0000
tree 87dfe8a8e9d27294ec4c94457ea29c917e187ab2
parent ed037dbf415f46145a101a8c449c39064c66d5b5
parent 3f4d546525651b43c3d1352059ee2966727b0806

Merge "Revert the DISMISSAL_NOT_DISMISSED to previous value."

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 6aef50e..72cf0c7 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4752,7 +4752,7 @@
     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

diff --git a/api/test-current.txt b/api/test-current.txt
index 33bcce4..f6cda32 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -1125,7 +1125,7 @@
     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

diff --git a/core/java/android/service/notification/NotificationStats.java b/core/java/android/service/notification/NotificationStats.java
index 9e23de1..e5f3dfb 100644
--- a/core/java/android/service/notification/NotificationStats.java
+++ b/core/java/android/service/notification/NotificationStats.java
@@ -52,7 +52,7 @@
     /**
      * 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.