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

Commit b4e19167 authored by Shareef Ali's avatar Shareef Ali Committed by Gerrit Code Review
Browse files

Merge "HTCQualcommRIL: skip setCdmaSubscriptionSource if... 

Merge "HTCQualcommRIL: skip setCdmaSubscriptionSource if CDMA_SUBSCRIPTION_MODE is null" into cm-10.2
parents d3a5d5bd 82bd50a7

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

+5 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.os.Looper; 
import android.os.Message;

import android.os.Parcel;

import android.os.SystemProperties;

import android.provider.Settings;

import android.text.TextUtils;

import android.telephony.CellInfo;

import android.telephony.Rlog;
@@ -164,7 +165,10 @@ public class HTCQualcommRIL extends RIL implements CommandsInterface { 
                // Trigger socket reset if RIL connect is called again

                SystemProperties.set("ril.socket.reset", "1");

                setPreferredNetworkType(mPreferredNetworkType, null);

                setCdmaSubscriptionSource(mCdmaSubscription, null);

                int cdmaSubscription = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.CDMA_SUBSCRIPTION_MODE, -1);

                if(cdmaSubscription != -1) {

                    setCdmaSubscriptionSource(cdmaSubscription, null);

                }

                setCellInfoListRate(Integer.MAX_VALUE, null);

                notifyRegistrantsRilConnectionChanged(((int[])ret)[0]);

                break;