From dfdb52abe601bc9b7ba41684a35f7a030b93f707 Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Wed, 17 Jun 2015 21:03:11 +0000
Subject: [PATCH] Revert "remove setLatestEventInfo"

This reverts commit 965097321df7fd57a35f63365b1de26ddcf35214.

Change-Id: I658bb2611fe8f983309e962d6772d1bd80ed586e
---
 api/current.txt                         | 1 +
 api/removed.txt                         | 8 --------
 api/system-current.txt                  | 1 +
 api/system-removed.txt                  | 8 --------
 core/java/android/app/Notification.java | 1 -
 5 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 4e885f7b98aa6..f180460a0287d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -4807,6 +4807,7 @@ package android.app {
     method public android.graphics.drawable.Icon getLargeIcon();
     method public android.graphics.drawable.Icon getSmallIcon();
     method public java.lang.String getSortKey();
+    method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent);
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.media.AudioAttributes AUDIO_ATTRIBUTES_DEFAULT;
     field public static final java.lang.String CATEGORY_ALARM = "alarm";
diff --git a/api/removed.txt b/api/removed.txt
index 8eb2d8e3c6088..2e6c6854a0902 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -1,11 +1,3 @@
-package android.app {
-
-  public class Notification implements android.os.Parcelable {
-    method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent);
-  }
-
-}
-
 package android.content.pm {
 
   public class PackageInfo implements android.os.Parcelable {
diff --git a/api/system-current.txt b/api/system-current.txt
index e8b0a313bc858..025fbde86c0b5 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4902,6 +4902,7 @@ package android.app {
     method public android.graphics.drawable.Icon getLargeIcon();
     method public android.graphics.drawable.Icon getSmallIcon();
     method public java.lang.String getSortKey();
+    method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent);
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.media.AudioAttributes AUDIO_ATTRIBUTES_DEFAULT;
     field public static final java.lang.String CATEGORY_ALARM = "alarm";
diff --git a/api/system-removed.txt b/api/system-removed.txt
index 8eb2d8e3c6088..2e6c6854a0902 100644
--- a/api/system-removed.txt
+++ b/api/system-removed.txt
@@ -1,11 +1,3 @@
-package android.app {
-
-  public class Notification implements android.os.Parcelable {
-    method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent);
-  }
-
-}
-
 package android.content.pm {
 
   public class PackageInfo implements android.os.Parcelable {
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 9d3bdf0e6d183..33a47b24b79de 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -1742,7 +1742,6 @@ public class Notification implements Parcelable
      * Stack</a> document.
      *
      * @deprecated Use {@link Builder} instead.
-     * @removed
      */
     @Deprecated
     public void setLatestEventInfo(Context context,