diff options
| author | Chris Wren <cwren@android.com> | 2015-06-24 22:17:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-24 22:17:45 +0000 |
| commit | 749d66b82fcfa82649536d2a0739a1a84edc0400 (patch) | |
| tree | d83112da855d9e038d965969d2b363dc0d78ac46 /api | |
| parent | cede20a7c273279a9bc51750bdd99c1383816e3e (diff) | |
| parent | a05db3816b4e29790aed9de9ef1cf4b2d0b616c9 (diff) | |
| download | frameworks_base-749d66b82fcfa82649536d2a0739a1a84edc0400.zip frameworks_base-749d66b82fcfa82649536d2a0739a1a84edc0400.tar.gz frameworks_base-749d66b82fcfa82649536d2a0739a1a84edc0400.tar.bz2 | |
Merge "remove setLatestEventInfo" into mnc-dev
Diffstat (limited to 'api')
| -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 |
4 files changed, 16 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 8d70a1e..ff6bf6f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4729,7 +4729,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 7fc927b..6d88cb6 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 5a08bc3..5003f91 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4831,7 +4831,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 7fc927b..6d88cb6 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 { |