From f745debf8961e4ce53b1d8d925900c714190e9be Mon Sep 17 00:00:00 2001
From: Jordan Liu <jminjie@google.com>
Date: Thu, 24 Jan 2019 10:55:15 -0800
Subject: [PATCH] Fix NPE in parcel constructor

Instead of calling .getClass().getClassLoader, we use .class to avoid
NPE on the uninitialized PreciseCallState and CallQuality.

Test: manual
Bug: 110107501
Change-Id: I1092122a69aa17235627a22fd973f21d49fc4812
---
 telephony/java/android/telephony/CallAttributes.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/telephony/java/android/telephony/CallAttributes.java b/telephony/java/android/telephony/CallAttributes.java
index 2b99ce1d8252a..2d29875aadb42 100644
--- a/telephony/java/android/telephony/CallAttributes.java
+++ b/telephony/java/android/telephony/CallAttributes.java
@@ -50,10 +50,10 @@ public class CallAttributes implements Parcelable {
     }
 
     private CallAttributes(Parcel in) {
-        mPreciseCallState = (PreciseCallState) in.readValue(mPreciseCallState.getClass()
-                .getClassLoader());
+        mPreciseCallState = (PreciseCallState)
+                in.readValue(PreciseCallState.class.getClassLoader());
         mNetworkType = in.readInt();
-        mCallQuality = (CallQuality) in.readValue(mCallQuality.getClass().getClassLoader());
+        mCallQuality = (CallQuality) in.readValue(CallQuality.class.getClassLoader());
     }
 
     // getters