summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErica Chang <echang@cyngn.com>2016-03-02 16:05:41 -0800
committerErica Chang <echang@cyngn.com>2016-04-07 12:05:48 -0700
commite73c0174600f21646ac6374b877a4356ad6ac5a2 (patch)
tree9f0aeaf9dd364d10a46ae7400065842b3511f2f1
parent42fed270f5f6f767bb9977c12e1cdd36546738ff (diff)
downloadandroid_packages_apps_Contacts-e73c0174600f21646ac6374b877a4356ad6ac5a2.tar.gz
android_packages_apps_Contacts-e73c0174600f21646ac6374b877a4356ad6ac5a2.tar.bz2
android_packages_apps_Contacts-e73c0174600f21646ac6374b877a4356ad6ac5a2.zip
Contacts: added fix for parcelable
Caused crash Change-Id: I1f46b9ba33bc2446bd25eed7db0bfb3033d58878
-rw-r--r--src/com/android/contacts/incall/InCallPluginInfo.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/contacts/incall/InCallPluginInfo.java b/src/com/android/contacts/incall/InCallPluginInfo.java
index 26ba0fc2e..4a1afd8b4 100644
--- a/src/com/android/contacts/incall/InCallPluginInfo.java
+++ b/src/com/android/contacts/incall/InCallPluginInfo.java
@@ -40,6 +40,8 @@ public class InCallPluginInfo implements Parcelable {
mCallMethodInfo.mAccountHandle = in.readString();
mCallMethodInfo.mIsAuthenticated = in.readInt() == 1;
mCallMethodInfo.mStatus = in.readInt();
+ mCallMethodInfo.mDefaultDirectorySearchIntent = in.readParcelable(PendingIntent.class
+ .getClassLoader());
mCallMethodInfo.mDirectorySearchIntent =
in.readParcelable(PendingIntent.class.getClassLoader());
mCallMethodInfo.mLoginIntent = in.readParcelable(PendingIntent.class.getClassLoader());
@@ -60,13 +62,13 @@ public class InCallPluginInfo implements Parcelable {
dest.writeString(mCallMethodInfo.mAccountHandle);
dest.writeInt(mCallMethodInfo.mIsAuthenticated ? 1 : 0);
dest.writeInt(mCallMethodInfo.mStatus);
+ dest.writeParcelable(mCallMethodInfo.mDefaultDirectorySearchIntent, flags);
dest.writeParcelable(mCallMethodInfo.mDirectorySearchIntent, flags);
dest.writeParcelable(mCallMethodInfo.mLoginIntent, flags);
dest.writeString(mCallMethodInfo.mName);
dest.writeInt(mCallMethodInfo.mBrandIconId);
dest.writeInt(mCallMethodInfo.mLoginIconId);
dest.writeString(mTabTag);
- dest.writeString(mTabTag);
dest.writeParcelable(mCallMethodInfo.mComponent, flags);
dest.writeParcelable(mCallMethodInfo.mNudgeComponent, flags);
dest.writeString(mCallMethodInfo.mDependentPackage);