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

2014-11-13 00:50:00 +00:00
parent 031d8feaa9 96802adcb8
commit 5e783896a2
1 changed files with 1 additions and 0 deletions
--- a/telecomm/java/android/telecom/PhoneAccount.java
+++ b/telecomm/java/android/telecom/PhoneAccount.java
@@ -640,6 +640,7 @@ public class PhoneAccount implements Parcelable {
        if (mIconBitmap == null) {
            out.writeInt(0);
        } else {
+            out.writeInt(1);
            mIconBitmap.writeToParcel(out, flags);
        }
        out.writeInt(mIconTint);