Merge "Fix PhoneAccount parceling (1/2)" into lmp-mr1-dev

This commit is contained in:
Yorke Lee
2014-11-13 00:50:00 +00:00
committed by Android (Google) Code Review

View File

@@ -640,6 +640,7 @@ public class PhoneAccount implements Parcelable {
if (mIconBitmap == null) { if (mIconBitmap == null) {
out.writeInt(0); out.writeInt(0);
} else { } else {
out.writeInt(1);
mIconBitmap.writeToParcel(out, flags); mIconBitmap.writeToParcel(out, flags);
} }
out.writeInt(mIconTint); out.writeInt(mIconTint);