summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorChris Wren <cwren@android.com>2015-06-17 21:03:11 +0000
committerChris Wren <cwren@android.com>2015-06-17 21:03:11 +0000
commitdfdb52abe601bc9b7ba41684a35f7a030b93f707 (patch)
tree0aac101e725bbe3be78ec11f3a408bae5749dfb9 /api
parent965097321df7fd57a35f63365b1de26ddcf35214 (diff)
downloadframeworks_base-dfdb52abe601bc9b7ba41684a35f7a030b93f707.zip
frameworks_base-dfdb52abe601bc9b7ba41684a35f7a030b93f707.tar.gz
frameworks_base-dfdb52abe601bc9b7ba41684a35f7a030b93f707.tar.bz2
Revert "remove setLatestEventInfo"
This reverts commit 965097321df7fd57a35f63365b1de26ddcf35214. Change-Id: I658bb2611fe8f983309e962d6772d1bd80ed586e
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
-rw-r--r--api/removed.txt8
-rw-r--r--api/system-current.txt1
-rw-r--r--api/system-removed.txt8
4 files changed, 2 insertions, 16 deletions
diff --git a/api/current.txt b/api/current.txt
index 4e885f7..f180460 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 8eb2d8e..2e6c685 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 e8b0a31..025fbde 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 8eb2d8e..2e6c685 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 {