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

Commit acdcfc90 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge "Change NetworkRegistrationManager mTag to be dsds agonostic." 

am: 53f857ff

Change-Id: I26d2820559ba00374fc5161b6faf332c67b441b4
parents dec7173b 53f857ff

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

+1 −5
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import android.telephony.INetworkServiceCallback; 
import android.telephony.NetworkRegistrationInfo;

import android.telephony.NetworkService;

import android.telephony.Rlog;

import android.telephony.TelephonyManager;

import android.text.TextUtils;



import java.util.Hashtable;
@@ -91,10 +90,7 @@ public class NetworkRegistrationManager extends Handler { 
        mPhone = phone;



        String tagSuffix = "-" + ((transportType == AccessNetworkConstants.TRANSPORT_TYPE_WWAN)

                ? "C" : "I");

        if (TelephonyManager.getDefault().getPhoneCount() > 1) {

            tagSuffix += "-" + mPhone.getPhoneId();

        }

                ? "C" : "I") + "-" + mPhone.getPhoneId();

        mTag = "NRM" + tagSuffix;



        mCarrierConfigManager = (CarrierConfigManager) phone.getContext().getSystemService(