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

Commit d7600022 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6259407 from 8d1ee4d1 to rvc-release 

Change-Id: I188858500f71574365877fb204b57103f1a8b26e
parents a2ff6bae 8d1ee4d1

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

+4 −4
Original line number Diff line number Diff line
@@ -197,14 +197,14 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 


    @Override

    public void notifyUserMobileDataStateChanged(Phone sender, boolean state) {

        mTelephonyRegistryMgr.notifyUserMobileDataStateChanged(

            sender.getSubId(), sender.getPhoneId(), state);

        mTelephonyRegistryMgr.notifyUserMobileDataStateChanged(sender.getPhoneId(),

                sender.getSubId(), state);

    }



    @Override

    public void notifyDisplayInfoChanged(Phone sender, DisplayInfo displayInfo) {

        mTelephonyRegistryMgr.notifyDisplayInfoChanged(

                sender.getSubId(), sender.getPhoneId(), displayInfo);

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

                displayInfo);

    }



    @Override

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

+3 −0
Original line number Diff line number Diff line
@@ -401,6 +401,7 @@ public class TelephonyTester { 
            }

            nri.setNrState(mServiceStateTestIntent.getIntExtra(EXTRA_NR_STATE,

                    NetworkRegistrationInfo.NR_STATE_NONE));

            ss.addNetworkRegistrationInfo(nri);

            log("Override NR state with " + ss.getNrState());

        }

        if (mServiceStateTestIntent.hasExtra(EXTRA_VOICE_RAT)) {
@@ -444,6 +445,7 @@ public class TelephonyTester { 
            }

            nri.setRoamingType(mServiceStateTestIntent.getIntExtra(EXTRA_VOICE_ROAMING_TYPE,

                    ServiceState.ROAMING_TYPE_UNKNOWN));

            ss.addNetworkRegistrationInfo(nri);

            log("Override voice roaming type with " + ss.getVoiceRoamingType());

        }

        if (mServiceStateTestIntent.hasExtra(EXTRA_DATA_ROAMING_TYPE)) {
@@ -457,6 +459,7 @@ public class TelephonyTester { 
            }

            nri.setRoamingType(mServiceStateTestIntent.getIntExtra(EXTRA_DATA_ROAMING_TYPE,

                    ServiceState.ROAMING_TYPE_UNKNOWN));

            ss.addNetworkRegistrationInfo(nri);

            log("Override data roaming type with " + ss.getDataRoamingType());

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        verify(mContextFixture.getTestDouble(), times(3))

                .sendStickyBroadcastAsUser(intentArgumentCaptor.capture(), eq(UserHandle.ALL));



        // We only want to verify the intent SPN_STRINGS_UPDATED_ACTION.

        // We only want to verify the intent SERVICE_PROVIDERS_UPDATED.

        List<Intent> intents = intentArgumentCaptor.getAllValues();

        logd("Total " + intents.size() + " intents");

        for (Intent intent : intents) {