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

Commit 1af7ffab authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Fixed misleading debug messages" 

am: d603dd81

Change-Id: Idd987100ece2038bac6fcc609da9dc96a6276587
parents acefc72f d603dd81

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+16 −2
Original line number Diff line number Diff line
@@ -586,7 +586,14 @@ public class DataConnection extends StateMachine { 
        ServiceState ss = mPhone.getServiceState();

        mRilRat = ss.getRilDataRadioTechnology();

        mDataRegState = mPhone.getServiceState().getDataRegState();

        int networkType = ss.getDataNetworkType();

        int networkType = TelephonyManager.NETWORK_TYPE_UNKNOWN;



        NetworkRegistrationInfo nri = ss.getNetworkRegistrationInfo(

                NetworkRegistrationInfo.DOMAIN_PS, mTransportType);

        if (nri != null) {

            networkType = nri.getAccessNetworkTechnology();

        }



        mNetworkInfo = new NetworkInfo(ConnectivityManager.TYPE_MOBILE,

                networkType, NETWORK_TYPE, TelephonyManager.getNetworkTypeName(networkType));

        mNetworkInfo.setRoaming(ss.getDataRoaming());
@@ -1622,7 +1629,14 @@ public class DataConnection extends StateMachine { 


    private void updateNetworkInfo() {

        final ServiceState state = mPhone.getServiceState();

        final int subtype = state.getDataNetworkType();



        NetworkRegistrationInfo nri = state.getNetworkRegistrationInfo(

                NetworkRegistrationInfo.DOMAIN_PS, mTransportType);

        int subtype = TelephonyManager.NETWORK_TYPE_UNKNOWN;

        if (nri != null) {

            subtype = nri.getAccessNetworkTechnology();

        }



        mNetworkInfo.setSubtype(subtype, TelephonyManager.getNetworkTypeName(subtype));

        mNetworkInfo.setRoaming(state.getDataRoaming());

    }