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

Commit 932b96e1 authored by Jordan Liu's avatar Jordan Liu Committed by Gerrit Code Review
Browse files

Merge "Pass the call network type up"

parents b97b5ef0 12fb9bd5

src/java/com/android/internal/telephony/DefaultPhoneNotifier.java

+4 −2
Original line number Diff line number Diff line
@@ -387,10 +387,12 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
    }



    @Override

    public void notifyCallQualityChanged(Phone sender, CallQuality callQuality) {

    public void notifyCallQualityChanged(Phone sender, CallQuality callQuality,

            int callNetworkType) {

        try {

            if (mRegistry != null) {

                mRegistry.notifyCallQualityChanged(callQuality, sender.getPhoneId());

                mRegistry.notifyCallQualityChanged(callQuality, sender.getPhoneId(),

                        callNetworkType);

            }

        } catch (RemoteException ex) {

            // system process is dead

src/java/com/android/internal/telephony/PhoneNotifier.java

+1 −1
Original line number Diff line number Diff line
@@ -86,5 +86,5 @@ public interface PhoneNotifier { 
    void notifyEmergencyNumberList();



    /** Notify of a change to the call quality of an active foreground call. */

    void notifyCallQualityChanged(Phone sender, CallQuality callQuality);

    void notifyCallQualityChanged(Phone sender, CallQuality callQuality, int callNetworkType);

}

src/java/com/android/internal/telephony/imsphone/ImsPhoneBase.java

+2 −2
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ abstract class ImsPhoneBase extends Phone { 
        mTtyModeReceivedRegistrants.notifyRegistrants(result);

    }



    public void onCallQualityChanged(CallQuality callQuality) {

        mNotifier.notifyCallQualityChanged(this, callQuality);

    public void onCallQualityChanged(CallQuality callQuality, int callNetworkType) {

        mNotifier.notifyCallQualityChanged(this, callQuality, callNetworkType);

    }



    @Override

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -2874,7 +2874,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
         */

        @Override

        public void onCallQualityChanged(ImsCall imsCall, CallQuality callQuality) {

            mPhone.onCallQualityChanged(callQuality);

            mPhone.onCallQualityChanged(callQuality, imsCall.getRadioTechnology());

        }

    };

tests/telephonytests/src/com/android/internal/telephony/mocks/TelephonyRegistryMock.java

+2 −1
Original line number Diff line number Diff line
@@ -369,7 +369,8 @@ public class TelephonyRegistryMock extends ITelephonyRegistry.Stub { 
    }



    @Override

    public void notifyCallQualityChanged(CallQuality callQuality, int phoneId) {

    public void notifyCallQualityChanged(CallQuality callQuality, int phoneId,

            int callNetworkType) {

        throw new RuntimeException("Not implemented");

    }