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

Commit 586953da authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "TelephonyDisplayInfo use PS WWAN NRI for data network type" into tm-dev

parents b6463ce4 6be58e08

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

+7 −2
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ import android.annotation.NonNull; 
import android.os.Handler;

import android.os.Registrant;

import android.os.RegistrantList;

import android.telephony.AccessNetworkConstants;

import android.telephony.AnomalyReporter;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.TelephonyDisplayInfo;

import android.telephony.TelephonyManager;

import android.util.IndentingPrintWriter;
@@ -88,8 +90,11 @@ public class DisplayInfoController extends Handler { 
     * NetworkTypeController.

     */

    public void updateTelephonyDisplayInfo() {

        TelephonyDisplayInfo newDisplayInfo = new TelephonyDisplayInfo(

                mPhone.getServiceState().getDataNetworkType(),

        NetworkRegistrationInfo nri =  mPhone.getServiceState().getNetworkRegistrationInfo(

                NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

        int dataNetworkType = nri == null ? TelephonyManager.NETWORK_TYPE_UNKNOWN

                : nri.getAccessNetworkTechnology();

        TelephonyDisplayInfo newDisplayInfo = new TelephonyDisplayInfo(dataNetworkType,

                mNetworkTypeController.getOverrideNetworkType());

        if (!newDisplayInfo.equals(mTelephonyDisplayInfo)) {

            logl("TelephonyDisplayInfo changed from " + mTelephonyDisplayInfo + " to "