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

Commit d5590151 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Gerrit Code Review
Browse files

Merge changes I8ec5da02,Ie138e7dd 

* changes:
  Resovle merge conflict.
  Register for network callback for DataSwitch
parents 922da90d 63cf6a81

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

+0 −2
Original line number Diff line number Diff line
@@ -1161,8 +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);

            mSetOpptSubCallback = callback;

            mValidator.validate(subIdToValidate, DEFAULT_VALIDATION_EXPIRATION_TIME,

                    false, mValidationCallback);