From eae57b26e604b94a1ebb0c12009e12806f2e5f9a Mon Sep 17 00:00:00 2001 From: Jordan Liu Date: Tue, 22 Jan 2019 16:17:35 -0800 Subject: [PATCH] CallQuality is set to empty instead of null Bug: 110107501 Test: manual Change-Id: Ifb289c1c61d7cf16a7c6b60b181b94cf759f75d8 --- api/system-current.txt | 2 +- services/core/java/com/android/server/TelephonyRegistry.java | 5 +++-- telephony/java/android/telephony/CallQuality.java | 4 ++++ telephony/java/android/telephony/PhoneStateListener.java | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 6d2473673051c..ebc7a9b8cd830 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5874,7 +5874,7 @@ package android.telephony { } public class PhoneStateListener { - method public void onCallAttributesChanged(android.telephony.CallAttributes); + method public void onCallAttributesChanged(@NonNull android.telephony.CallAttributes); method public void onCallDisconnectCauseChanged(int, int); method public void onPreciseCallStateChanged(android.telephony.PreciseCallState); method public void onPreciseDataConnectionStateChanged(android.telephony.PreciseDataConnectionState); diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index 122112b7a7d4b..41d8d9c0548a2 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -206,9 +206,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { private Map> mEmergencyNumberList; - private CallQuality mCallQuality; + private CallQuality mCallQuality = new CallQuality(); - private CallAttributes mCallAttributes; + private CallAttributes mCallAttributes = new CallAttributes(new PreciseCallState(), + TelephonyManager.NETWORK_TYPE_UNKNOWN, new CallQuality()); private int[] mSrvccState; diff --git a/telephony/java/android/telephony/CallQuality.java b/telephony/java/android/telephony/CallQuality.java index b27f6b44370f1..cbe6228471306 100644 --- a/telephony/java/android/telephony/CallQuality.java +++ b/telephony/java/android/telephony/CallQuality.java @@ -92,6 +92,10 @@ public final class CallQuality implements Parcelable { mCodecType = in.readInt(); } + /** @hide **/ + public CallQuality() { + } + /** * Constructor. * diff --git a/telephony/java/android/telephony/PhoneStateListener.java b/telephony/java/android/telephony/PhoneStateListener.java index 9fee5932dadc3..af324debbd577 100644 --- a/telephony/java/android/telephony/PhoneStateListener.java +++ b/telephony/java/android/telephony/PhoneStateListener.java @@ -701,7 +701,7 @@ public class PhoneStateListener { * @hide */ @SystemApi - public void onCallAttributesChanged(CallAttributes callAttributes) { + public void onCallAttributesChanged(@NonNull CallAttributes callAttributes) { // default implementation empty }