Merge "CallQuality is set to empty instead of null" am: b3f282daa1

am: aee66949ef

Change-Id: Iee5f05e4cc0efc8c0abbe2c46c7ceedea164bbee

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);

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;
 

telephony/java/android/telephony/CallQuality.java

@@ -92,6 +92,10 @@ public final class CallQuality implements Parcelable {
         mCodecType = in.readInt();
     }
 
+    /** @hide **/
+    public CallQuality() {
+    }
+
     /**
      * Constructor.
      *

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
     }