Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 90ac386b: Merge "Deal more gracefully with null smallIcons." into mnc-dev

Browse Source 
* commit '90ac386b4e4ee2679a2b7af83642ab74967c51e3':
  Deal more gracefully with null smallIcons.
This commit is contained in:
Dan Sandler
2015-05-20 14:14:50 +00:00
committed by Android Git Automerger
parent aa488cb835 90ac386b4e
commit 2f99ca32db
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/Notification.java
View File

@@ -1366,7 +1366,9 @@ public class Notification implements Parcelable
int version = parcel.readInt();
when = parcel.readLong();
mSmallIcon = Icon.CREATOR.createFromParcel(parcel);
if (parcel.readInt() != 0) {
mSmallIcon = Icon.CREATOR.createFromParcel(parcel);
}
number = parcel.readInt();
if (parcel.readInt() != 0) {
contentIntent = PendingIntent.CREATOR.createFromParcel(parcel);
@@ -1590,7 +1592,12 @@ public class Notification implements Parcelable
parcel.writeInt(1);
parcel.writeLong(when);
mSmallIcon.writeToParcel(parcel, 0);
if (mSmallIcon != null) {
parcel.writeInt(1);
mSmallIcon.writeToParcel(parcel, 0);
} else {
parcel.writeInt(0);
}
parcel.writeInt(number);
if (contentIntent != null) {
parcel.writeInt(1);
@@ -3241,7 +3248,7 @@ public class Notification implements Parcelable
Notification n = new Notification();
n.when = mWhen;
n.mSmallIcon = mSmallIcon;
if (mSmallIcon.getType() == Icon.TYPE_RESOURCE) {
if (mSmallIcon != null && mSmallIcon.getType() == Icon.TYPE_RESOURCE) {
n.icon = mSmallIcon.getResId();
}
n.iconLevel = mSmallIconLevel;