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

Commit 7f42c78a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Check subid when querying network selection"

parents 52ea1a0d a30934c5

src/java/com/android/internal/telephony/gsm/GSMPhone.java

+2 −3
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.telephony.TelephonyManager; 


import com.android.internal.telephony.CallTracker;

import com.android.internal.telephony.ConfigResourceUtil;

import com.android.internal.telephony.PhoneFactory;



import android.text.TextUtils;

import android.telephony.Rlog;
@@ -1901,9 +1902,7 @@ public class GSMPhone extends PhoneBase { 
        int nwMode = Phone.PREFERRED_NT_MODE;

        int subId = getSubId();



        nwMode = android.provider.Settings.Global.getInt(mContext.getContentResolver(),

                    android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId, nwMode);



        nwMode = PhoneFactory.calculatePreferredNetworkType(mContext, subId);

        Rlog.d(LOG_TAG, "isManualNetSelAllowed in mode = " + nwMode);

        /*

         *  For multimode targets in global mode manual network