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

Commit 545dd777 authored by SongFerngWang's avatar SongFerngWang Committed by SongFerng Wang
Browse files

LegacyState does not send notifyDisplayInfoChanged 

1. LegacyState add the updateOverrideNetworkType
when EVENT_DATA_RAT_CHANGED
2. TelephonyTester add operator_raw case

Bug: 156463826
Test: adb shell am broadcast -a \
com.android.internal.telephony.TestServiceState --ei \
data_rat 14 --ei nr_state 0 --ei nr_frequency_range 0 --es operator_raw\
 "AT\&T\\.\\.\\.1"

Change-Id: Ife70786f426a884a3d935b509ebc9f75377c00bc
parent 256a392f

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

+2 −0
Original line number Diff line number Diff line
@@ -500,6 +500,8 @@ public class NetworkTypeController extends StateMachine { 
                        transitionTo(mNrConnectedState);

                    } else if (isLte(rat) && isNrNotRestricted()) {

                        transitionWithTimerTo(isDataActive() ? mLteConnectedState : mIdleState);

                    } else {

                        updateOverrideNetworkType();

                    }

                    break;

                case EVENT_NR_STATE_CHANGED:

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

+7 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ public class TelephonyTester { 
    private static final String EXTRA_NR_FREQUENCY_RANGE = "nr_frequency_range";

    private static final String EXTRA_NR_STATE = "nr_state";

    private static final String EXTRA_OPERATOR = "operator";

    private static final String EXTRA_OPERATOR_RAW = "operator_raw";



    private static final String ACTION_RESET = "reset";
@@ -403,6 +404,12 @@ public class TelephonyTester { 
            ss.setOperatorName(operator, operator, "");

            log("Override operator with " + operator);

        }

        if (mServiceStateTestIntent.hasExtra(EXTRA_OPERATOR_RAW)) {

            String operator_raw = mServiceStateTestIntent.getStringExtra(EXTRA_OPERATOR_RAW);

            ss.setOperatorAlphaLongRaw(operator_raw);

            ss.setOperatorAlphaShortRaw(operator_raw);

            log("Override operator_raw with " + operator_raw);

        }

        if (mServiceStateTestIntent.hasExtra(EXTRA_NR_FREQUENCY_RANGE)) {

            ss.setNrFrequencyRange(mServiceStateTestIntent.getIntExtra(EXTRA_NR_FREQUENCY_RANGE,

                    ServiceState.FREQUENCY_RANGE_UNKNOWN));