summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hall Liu <hallliu@google.com> 2018-01-12 23:11:03 +0000
committer android-build-merger <android-build-merger@google.com> 2018-01-12 23:11:03 +0000
commit4ba6ba6cb25caae346ae06af0eae600d568fa513 (patch)
tree3fd3dd6b7adb41673b3e0ca94faf7a5df62786af
parent4c39196819106ffac6f9b0f8809ff71e8955181e (diff)
parentff63c8323788f9a194dedaeec7af766afd6e836e (diff)
Merge "Use proper classloader when reading from parcel" am: d3cb6380a4 am: 03a515aed4
am: ff63c83237 Change-Id: If91f694b4f9c396e118dcf47ebaa480ff4cd44d0
-rw-r--r--telephony/java/com/android/ims/ImsCallProfile.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/ims/ImsCallProfile.java b/telephony/java/com/android/ims/ImsCallProfile.java
index 489c208a0d46..693aaff8ce0f 100644
--- a/telephony/java/com/android/ims/ImsCallProfile.java
+++ b/telephony/java/com/android/ims/ImsCallProfile.java
@@ -351,7 +351,7 @@ public class ImsCallProfile implements Parcelable {
mServiceType = in.readInt();
mCallType = in.readInt();
mCallExtras = in.readBundle();
- mMediaProfile = in.readParcelable(null);
+ mMediaProfile = in.readParcelable(ImsStreamMediaProfile.class.getClassLoader());
}
public static final Creator<ImsCallProfile> CREATOR = new Creator<ImsCallProfile>() {