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

Commit 14439933 authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge "[Telephony] Add phoneId and subId for notifying data enabled under... 

Merge "[Telephony] Add phoneId and subId for notifying data enabled under muti-sim case" into sc-dev
parents 09d8b8df fbda355a

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

+26 −25
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
        if (ringingCall != null && ringingCall.getEarliestConnection() != null) {

            incomingNumber = ringingCall.getEarliestConnection().getAddress();

        }

        mTelephonyRegistryMgr.notifyCallStateChanged(subId, phoneId,

        mTelephonyRegistryMgr.notifyCallStateChanged(phoneId, subId,

                PhoneConstantConversions.convertCallState(sender.getState()), incomingNumber);

    }
@@ -86,7 +86,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
            ss = new ServiceState();

            ss.setStateOutOfService();

        }

        mTelephonyRegistryMgr.notifyServiceStateChanged(subId, phoneId, ss);

        mTelephonyRegistryMgr.notifyServiceStateChanged(phoneId, subId, ss);

    }



    @Override
@@ -98,7 +98,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
            Rlog.d(LOG_TAG, "notifySignalStrength: mRegistryMgr=" + mTelephonyRegistryMgr

                + " ss=" + sender.getSignalStrength() + " sender=" + sender);

        }

        mTelephonyRegistryMgr.notifySignalStrengthChanged(subId, phoneId,

        mTelephonyRegistryMgr.notifySignalStrengthChanged(phoneId, subId,

                sender.getSignalStrength());

    }
@@ -106,7 +106,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
    public void notifyMessageWaitingChanged(Phone sender) {

        int phoneId = sender.getPhoneId();

        int subId = sender.getSubId();

        mTelephonyRegistryMgr.notifyMessageWaitingChanged(subId, phoneId,

        mTelephonyRegistryMgr.notifyMessageWaitingChanged(phoneId, subId,

                sender.getMessageWaitingIndicator());

    }
@@ -150,7 +150,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
        Call foregroundCall = sender.getForegroundCall();

        Call backgroundCall = sender.getBackgroundCall();

        if (ringingCall != null && foregroundCall != null && backgroundCall != null) {

            mTelephonyRegistryMgr.notifyPreciseCallState(sender.getSubId(), sender.getPhoneId(),

            mTelephonyRegistryMgr.notifyPreciseCallState(sender.getPhoneId(), sender.getSubId(),

                    convertPreciseCallState(ringingCall.getState()),

                    convertPreciseCallState(foregroundCall.getState()),

                    convertPreciseCallState(backgroundCall.getState()));
@@ -174,14 +174,14 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 


    @Override

    public void notifyDataActivationStateChanged(Phone sender, int activationState) {

        mTelephonyRegistryMgr.notifyDataActivationStateChanged(sender.getSubId(),

            sender.getPhoneId(), activationState);

        mTelephonyRegistryMgr.notifyDataActivationStateChanged(sender.getPhoneId(),

                sender.getSubId(), activationState);

    }



    @Override

    public void notifyVoiceActivationStateChanged(Phone sender, int activationState) {

        mTelephonyRegistryMgr.notifyVoiceActivationStateChanged(sender.getSubId(),

            sender.getPhoneId(),  activationState);

        mTelephonyRegistryMgr.notifyVoiceActivationStateChanged(sender.getPhoneId(),

                sender.getSubId(), activationState);

    }



    @Override
@@ -203,13 +203,13 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 


    @Override

    public void notifyRadioPowerStateChanged(Phone sender, @RadioPowerState int state) {

        mTelephonyRegistryMgr.notifyRadioPowerStateChanged(sender.getSubId(), sender.getPhoneId(),

        mTelephonyRegistryMgr.notifyRadioPowerStateChanged(sender.getPhoneId(), sender.getSubId(),

                state);

    }



    @Override

    public void notifyEmergencyNumberList(Phone sender) {

        mTelephonyRegistryMgr.notifyEmergencyNumberList(sender.getSubId(), sender.getPhoneId());

        mTelephonyRegistryMgr.notifyEmergencyNumberList(sender.getPhoneId(), sender.getSubId());

    }



    @Override
@@ -221,7 +221,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
    @Override

    public void notifyCallQualityChanged(Phone sender, CallQuality callQuality,

            int callNetworkType) {

        mTelephonyRegistryMgr.notifyCallQualityChanged(sender.getSubId(), sender.getPhoneId(),

        mTelephonyRegistryMgr.notifyCallQualityChanged(sender.getPhoneId(), sender.getSubId(),

                callQuality, callNetworkType);

    }
@@ -246,15 +246,16 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
    }



    @Override

    public void notifyDataEnabled(boolean enabled, @DataEnabledReason int reason) {

        mTelephonyRegistryMgr.notifyDataEnabled(enabled, reason);

    public void notifyDataEnabled(Phone sender, boolean enabled, @DataEnabledReason int reason) {

        mTelephonyRegistryMgr.notifyDataEnabled(sender.getPhoneId(), sender.getSubId(),

                enabled, reason);

    }



    @Override

    public void notifyAllowedNetworkTypesChanged(Phone sender,

            Map<Integer, Long> allowedNetworkTypeList) {

        mTelephonyRegistryMgr.notifyAllowedNetworkTypesChanged(sender.getSubId(),

                sender.getPhoneId(), allowedNetworkTypeList);

        mTelephonyRegistryMgr.notifyAllowedNetworkTypesChanged(sender.getPhoneId(),

                sender.getSubId(), allowedNetworkTypeList);

    }



    /**

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

+1 −1
Original line number Diff line number Diff line
@@ -2816,7 +2816,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    /** Notify the data enabled changes. */

    public void notifyDataEnabled(boolean enabled,

            @TelephonyManager.DataEnabledReason int reason) {

        mNotifier.notifyDataEnabled(enabled, reason);

        mNotifier.notifyDataEnabled(this, enabled, reason);

    }



    /**

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

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public interface PhoneNotifier { 
    void notifyPhysicalChannelConfig(Phone sender, List<PhysicalChannelConfig> configs);



    /** Notify DataEnabled has changed. */

    void notifyDataEnabled(boolean enabled, @DataEnabledReason int reason);

    void notifyDataEnabled(Phone sender, boolean enabled, @DataEnabledReason int reason);



    /** Notify Allowed Network Type has changed. */

    void notifyAllowedNetworkTypesChanged(Phone sender, Map<Integer, Long> allowedNetworkType);

tests/telephonytests/src/com/android/internal/telephony/DefaultPhoneNotifierTest.java

+5 −5
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ public class DefaultPhoneNotifierTest extends TelephonyTest { 
        doReturn(1).when(mPhone).getSubId();

        doReturn(2).when(mPhone).getPhoneId();

        mDefaultPhoneNotifierUT.notifySignalStrength(mPhone);

        verify(mTelephonyRegistryManager).notifySignalStrengthChanged(eq(1), eq(2),

        verify(mTelephonyRegistryManager).notifySignalStrengthChanged(eq(2), eq(1),

                signalStrengthArgumentCaptor.capture());

        assertEquals(99, signalStrengthArgumentCaptor.getValue().getGsmSignalStrength());

    }
@@ -135,19 +135,19 @@ public class DefaultPhoneNotifierTest extends TelephonyTest { 
    public void testNotifyMessageWaiting() throws Exception {

        doReturn(1).when(mPhone).getPhoneId();

        mDefaultPhoneNotifierUT.notifyMessageWaitingChanged(mPhone);

        verify(mTelephonyRegistryManager).notifyMessageWaitingChanged(0, 1, false);

        verify(mTelephonyRegistryManager).notifyMessageWaitingChanged(1, 0, false);



        doReturn(2).when(mPhone).getPhoneId();

        mDefaultPhoneNotifierUT.notifyMessageWaitingChanged(mPhone);

        verify(mTelephonyRegistryManager).notifyMessageWaitingChanged(0, 2, false);

        verify(mTelephonyRegistryManager).notifyMessageWaitingChanged(2, 0, false);



        doReturn(1).when(mPhone).getSubId();

        mDefaultPhoneNotifierUT.notifyMessageWaitingChanged(mPhone);

        verify(mTelephonyRegistryManager).notifyMessageWaitingChanged(1, 2, false);

        verify(mTelephonyRegistryManager).notifyMessageWaitingChanged(2, 1, false);



        doReturn(true).when(mPhone).getMessageWaitingIndicator();

        mDefaultPhoneNotifierUT.notifyMessageWaitingChanged(mPhone);

        verify(mTelephonyRegistryManager).notifyMessageWaitingChanged(1, 2, true);

        verify(mTelephonyRegistryManager).notifyMessageWaitingChanged(2, 1, true);

    }



    @Test @SmallTest