Merge "Revert "remove setLatestEventInfo"" into mnc-dev

This commit is contained in:
Chris Wren
2015-06-17 21:03:22 +00:00
committed by Android (Google) Code Review
5 changed files with 2 additions and 17 deletions

View File

@@ -4812,6 +4812,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";

View File

@@ -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 {

View File

@@ -4907,6 +4907,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";

View File

@@ -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 {

View File

@@ -1742,7 +1742,6 @@ public class Notification implements Parcelable
* Stack</a> document.
*
* @deprecated Use {@link Builder} instead.
* @removed
*/
@Deprecated
public void setLatestEventInfo(Context context,