Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit baa788a7 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

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

am: aee66949

Change-Id: Iee5f05e4cc0efc8c0abbe2c46c7ceedea164bbee
parents c322894c aee66949

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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



+3
−2




























Original line number
Diff line number
Diff line








@@ -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



+4
−0




























Original line number
Diff line number
Diff line








@@ -92,6 +92,10 @@ public final class CallQuality implements Parcelable {













        mCodecType = in.readInt();















    }





























    /** @hide **/













    public CallQuality() {













    }





























    /**















     * Constructor.















     *

































telephony/java/android/telephony/PhoneStateListener.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -701,7 +701,7 @@ public class PhoneStateListener {













     * @hide















     */















    @SystemApi













    public void onCallAttributesChanged(CallAttributes callAttributes) {













    public void onCallAttributesChanged(@NonNull CallAttributes callAttributes) {















        // default implementation empty















    }