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

Commit 63cf6a81 authored by Malcolm Chen's avatar Malcolm Chen
Browse files

Resovle merge conflict. 

Merge conflict is caused by Ie138e7dd11da66b482a296dd15c645631d7546ba
and I32f311a628c29a592481a6bcd3fe105ff173b22f.

Bug: 139721623
Test: build
Change-Id: I8ec5da02b529c1a3c8a8c5abd4a485cfc3bef56c
parent a9253790

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

+0 −3
Original line number Diff line number Diff line
@@ -1161,9 +1161,6 @@ public class PhoneSwitcher extends Handler { 
        // If validation feature is not supported, set it directly. Otherwise,

        // start validation on the subscription first.

        if (mValidator.isValidationFeatureSupported() && needValidation) {

            logDataSwitchEvent(subId, TelephonyEvent.EventState.EVENT_STATE_START,

                    DataSwitch.Reason.DATA_SWITCH_REASON_CBRS);

            registerDefaultNetworkChangeCallback();

            mSetOpptSubCallback = callback;

            mValidator.validate(subIdToValidate, DEFAULT_VALIDATION_EXPIRATION_TIME,

                    false, mValidationCallback);