diff options
| author | 2019-01-28 20:14:51 -0800 | |
|---|---|---|
| committer | 2019-01-28 20:14:51 -0800 | |
| commit | aee66949efddb4f7e877c048e66ccd7fb8050fb9 (patch) | |
| tree | 7c872cb05f7bcfa624e0087089755a97c5dafba2 | |
| parent | 888d87ac7a6a4dfccf67fc3295f4312e271065d3 (diff) | |
| parent | b3f282daa1c2163ce495673944e46be6d7e76c8d (diff) | |
Merge "CallQuality is set to empty instead of null"
am: b3f282daa1
Change-Id: I57b228b8d8b2c42c8a23e33d4c1c18a94c838907
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/TelephonyRegistry.java | 5 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CallQuality.java | 4 | ||||
| -rw-r--r-- | 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 cdb83c6fb89e..f07f0c309346 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -6027,7 +6027,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 1798f388ab27..cbfcd6035d5e 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<Integer, List<EmergencyNumber>> 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 b27f6b44370f..cbe622847130 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 9fee5932dadc..af324debbd57 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 } |