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

Commit b9f55143 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 

am: baa788a7

Change-Id: Ic6c251059d763df6f79520a5cae259f4a44601cf
parents f366fade baa788a7

api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -7527,7 +7527,7 @@ package android.telephony { 
  }

  }

















  public class PhoneStateListener {







  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 onCallDisconnectCauseChanged(int, int);











    method public void onPreciseCallStateChanged(android.telephony.PreciseCallState);







    method public void onPreciseCallStateChanged(android.telephony.PreciseCallState);











    method public void onPreciseDataConnectionStateChanged(android.telephony.PreciseDataConnectionState);







    method public void onPreciseDataConnectionStateChanged(android.telephony.PreciseDataConnectionState);

































services/core/java/com/android/server/TelephonyRegistry.java



+3
−2




























Original line number
Original line
Diff line number
Diff line








@@ -206,9 +206,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {





























    private Map<Integer, List<EmergencyNumber>> mEmergencyNumberList;







    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;







    private int[] mSrvccState;





















































telephony/java/android/telephony/CallQuality.java



+4
−0




























Original line number
Original line
Diff line number
Diff line








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









        mCodecType = in.readInt();







        mCodecType = in.readInt();











    }







    }


































    /** @hide **/














    public CallQuality() {














    }


























    /**







    /**











     * Constructor.







     * Constructor.











     *







     *

































telephony/java/android/telephony/PhoneStateListener.java



+1
−1




























Original line number
Original line
Diff line number
Diff line








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









     * @hide







     * @hide











     */







     */











    @SystemApi







    @SystemApi











    public void onCallAttributesChanged(CallAttributes callAttributes) {







    public void onCallAttributesChanged(@NonNull CallAttributes callAttributes) {











        // default implementation empty







        // default implementation empty











    }







    }