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

Commit 9a8c1467 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Fixed incorrect IWLAN service state in legacy mode" into qt-dev

parents fdab299b 74d8ea72

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

+2 −2
Original line number Diff line number Diff line
@@ -5201,7 +5201,7 @@ public class ServiceStateTracker extends Handler { 
        // mode, the WWAN registration will correctly report the actual cellular registration info

        // when the device camps on IWLAN.

        if (mTransportManager.isInLegacyMode()) {

            NetworkRegistrationInfo wwanNri = mSS.getNetworkRegistrationInfo(

            NetworkRegistrationInfo wwanNri = mNewSS.getNetworkRegistrationInfo(

                    NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

            if (wwanNri != null && wwanNri.getAccessNetworkTechnology()

                    == TelephonyManager.NETWORK_TYPE_IWLAN) {
@@ -5214,7 +5214,7 @@ public class ServiceStateTracker extends Handler { 
                        .setEmergencyOnly(wwanNri.isEmergencyEnabled())

                        .setAvailableServices(wwanNri.getAvailableServices())

                        .build();

                mSS.addNetworkRegistrationInfo(wlanNri);

                mNewSS.addNetworkRegistrationInfo(wlanNri);

            }

        }

    }