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

Commit 90de30ed authored by Umashankar Godachi's avatar Umashankar Godachi Committed by Luca Stefani
Browse files

MSIM: Fix user set DDS sub in hotswap cases. 

Currently if user set DDS sim is removed and inserted,
dds will not fallback to user preferred sub.

Fix: Save the user preferred DDS sub in DB and set it
as DDS sub, when sim is removed and inserted.

Change-Id: Ic34fdbad70a7dc99a0fa5de9cbb9d24caa6bac87
CRs-Fixed: 958445
parent 72aab9d4

src/com/android/settings/sim/SimDialogActivity.java

+11 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.telecom.TelecomManager; 
import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.util.Log;

import android.view.KeyEvent;

import android.view.LayoutInflater;

import android.view.View;
@@ -56,6 +57,8 @@ public class SimDialogActivity extends Activity { 
    public static final int SMS_PICK = 2;

    public static final int PREFERRED_PICK = 3;



    private static final String SETTING_USER_PREF_DATA_SUB = "user_preferred_data_sub";



    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
@@ -96,6 +99,7 @@ public class SimDialogActivity extends Activity { 
                    PhoneAccountHandle phoneAccountHandle =

                            subscriptionIdToPhoneAccountHandle(subId);

                    setDefaultDataSubId(context, subId);

                    setUserPrefDataSubIdInDb(subId);

                    setDefaultSmsSubId(context, subId);

                    setUserSelectedOutgoingPhoneAccount(phoneAccountHandle);

                    finish();
@@ -121,6 +125,12 @@ public class SimDialogActivity extends Activity { 
        Toast.makeText(context, R.string.data_switch_started, Toast.LENGTH_LONG).show();

    }



    private void setUserPrefDataSubIdInDb(int subId) {

        android.provider.Settings.Global.putInt(getContentResolver(),

                SETTING_USER_PREF_DATA_SUB, subId);

        Log.d(TAG, "updating data subId: " + subId + " in DB");

    }



    private static void setDefaultSmsSubId(final Context context, final int subId) {

        final SubscriptionManager subscriptionManager = SubscriptionManager.from(context);

        subscriptionManager.setDefaultSmsSubId(subId);
@@ -166,6 +176,7 @@ public class SimDialogActivity extends Activity { 
                            case DATA_PICK:

                                sir = subInfoList.get(value);

                                setDefaultDataSubId(context, sir.getSubscriptionId());

                                setUserPrefDataSubIdInDb(sir.getSubscriptionId());

                                break;

                            case CALLS_PICK:

                                final TelecomManager telecomManager =