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

Commit 5b870ff1 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix bug: TestServiceState can't fake nr_state,data_roaming,voice_roaming" am: 0b9d3d49 

Change-Id: Ib2980381af5e6cb45702e68a0e83d372c2201172
parents ce64b34b 0b9d3d49

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());

        }

    }