diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-11-13 00:50:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-13 00:50:02 +0000 |
| commit | 5e783896a20aeef2cf253331b7db245eade04b64 (patch) | |
| tree | d4e429411281ae41bc991baad38981a28af81948 | |
| parent | 031d8feaa96c2d47122ba352d282d0f762aac023 (diff) | |
| parent | 96802adcb864e60d701f2c4d7a4dc04e9f716fdc (diff) | |
| download | frameworks_base-5e783896a20aeef2cf253331b7db245eade04b64.zip frameworks_base-5e783896a20aeef2cf253331b7db245eade04b64.tar.gz frameworks_base-5e783896a20aeef2cf253331b7db245eade04b64.tar.bz2 | |
Merge "Fix PhoneAccount parceling (1/2)" into lmp-mr1-dev
| -rw-r--r-- | telecomm/java/android/telecom/PhoneAccount.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java index a49c204..2240c44 100644 --- 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); |