diff options
| author | 2015-06-17 20:05:04 +0000 | |
|---|---|---|
| committer | 2015-06-17 20:05:11 +0000 | |
| commit | c20c1eec9e222870b08c079898dbc334858994cc (patch) | |
| tree | 4ab0feb67e5ff53e6c45cd8a6f175e5e0c9043e4 | |
| parent | d1419ed29a694dffc98e9f352f952b805c6e0583 (diff) | |
| parent | 965097321df7fd57a35f63365b1de26ddcf35214 (diff) | |
Merge "remove setLatestEventInfo" into mnc-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/removed.txt | 8 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/system-removed.txt | 8 | ||||
| -rw-r--r-- | core/java/android/app/Notification.java | 1 |
5 files changed, 17 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 2186b158579c..3fd4fcb9f622 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4809,7 +4809,6 @@ 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 2e6c6854a090..8eb2d8e3c608 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -1,3 +1,11 @@ +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 9d11c1ccb154..25ef6be69c7f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4904,7 +4904,6 @@ 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 2e6c6854a090..8eb2d8e3c608 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -1,3 +1,11 @@ +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 33a47b24b79d..9d3bdf0e6d18 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -1742,6 +1742,7 @@ public class Notification implements Parcelable * Stack</a> document. * * @deprecated Use {@link Builder} instead. + * @removed */ @Deprecated public void setLatestEventInfo(Context context, |