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

Commit 01504b9e authored by Pengquan Meng's avatar Pengquan Meng Committed by android-build-merger
Browse files

Merge "Fixed network mode loaded issue" am: 7abeb535 

am: b67f53ff

Change-Id: I1230339d1f3af322fc210e2512e2da22f47b11a9
parents 9498fc2f b67f53ff

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

+13 −4
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.preference.PreferenceManager;

import android.provider.Settings;

import android.provider.Settings.Global;

import android.service.euicc.EuiccProfileInfo;

import android.service.euicc.EuiccService;

import android.service.euicc.GetEuiccProfileInfoListResult;
@@ -461,13 +462,21 @@ public class SubscriptionInfoUpdater extends Handler { 
                int storedSubId = sp.getInt(CURR_SUBID + slotId, -1);



                if (storedSubId != subId) {

                    int networkType = RILConstants.PREFERRED_NETWORK_MODE;

                    int networkType = Settings.Global.getInt(

                            mPhone[slotId].getContext().getContentResolver(),

                            Settings.Global.PREFERRED_NETWORK_MODE + subId,

                            -1 /* invalid network mode */);



                    if (networkType == -1) {

                        networkType = RILConstants.PREFERRED_NETWORK_MODE;

                        Settings.Global.putInt(

                                mPhone[slotId].getContext().getContentResolver(),

                                Global.PREFERRED_NETWORK_MODE + subId,

                                networkType);

                    }



                    // Set the modem network mode

                    mPhone[slotId].setPreferredNetworkType(networkType, null);

                    Settings.Global.putInt(mPhone[slotId].getContext().getContentResolver(),

                            Settings.Global.PREFERRED_NETWORK_MODE + subId,

                            networkType);



                    // Only support automatic selection mode on SIM change.

                    mPhone[slotId].getNetworkSelectionMode(