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

Commit a54898e0 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Fixed a minor issue during airplane mode am: f164a0fd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2009657

Change-Id: I68e26510aefc6706369ffbb5d6c4cac81f39871c
parents a4f52ce5 f164a0fd

src/java/com/android/internal/telephony/data/DataNetworkController.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -990,7 +990,8 @@ public class DataNetworkController extends Handler { 
        // We are using getDesiredPowerState() instead of isRadioOn() because we also don't want

        // We are using getDesiredPowerState() instead of isRadioOn() because we also don't want

        // to setup data network when radio power is about to be turned off.

        // to setup data network when radio power is about to be turned off.

        if (transport == AccessNetworkConstants.TRANSPORT_TYPE_WWAN

        if (transport == AccessNetworkConstants.TRANSPORT_TYPE_WWAN

                && !mPhone.getServiceStateTracker().getDesiredPowerState()) {

                && (!mPhone.getServiceStateTracker().getDesiredPowerState()

                || mPhone.mCi.getRadioState() != TelephonyManager.RADIO_POWER_ON)) {

            evaluation.addDataDisallowedReason(DataDisallowedReason.RADIO_POWER_OFF);

            evaluation.addDataDisallowedReason(DataDisallowedReason.RADIO_POWER_OFF);

        }

        }
@@ -2192,7 +2193,7 @@ public class DataNetworkController extends Handler { 
        pw.println("mImsDataNetworkState="

        pw.println("mImsDataNetworkState="

                + TelephonyUtils.dataStateToString(mImsDataNetworkState));

                + TelephonyUtils.dataStateToString(mImsDataNetworkState));

        pw.println("mDataServiceBound=" + mDataServiceBound);

        pw.println("mDataServiceBound=" + mDataServiceBound);

        pw.println("mSimState=" + mSimState);

        pw.println("mSimState=" + SubscriptionInfoUpdater.simStateString(mSimState));

        pw.println(mDataNetworkControllerCallbacks);

        pw.println(mDataNetworkControllerCallbacks);

        pw.println("Local logs:");

        pw.println("Local logs:");

        pw.increaseIndent();

        pw.increaseIndent();