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

Commit 32708fbc authored by sandeepjs's avatar sandeepjs Committed by Muralidhar Reddy Mule
Browse files

Avoid Showing Dialog in SetUpWizard. 

During Suw, when we have multiple active subscriptions, dialog is being
displayed to user to select prefered SIM and User confirmation to use
newly activated subscription for mobile data use. In Suw flow we have a
dedicated preference Selection Activity for multiple active profiles,
we do not need to show separate dialog for this.

testing scenarios : During SuW flow no dialog is observed
rest in below scenarios observed
1. Disabled the SIM with preferred Data --> after  disabling it will ask Update preferred SIM Card dialog
2. After enabling any 2 nd SIM(if no default Mobile data selected) --> will ask to Select Mobile data dialog
3. After enabling a profile --> will ask -- > Use [Carrier name]  for mobile data?
4. After inserting pSIM (when only 1 eSIM is Active) --> after turn on dialog,-->  Use [Carrier name]  for mobile data?

Test: manual test
Bug: 235552523
Change-Id: I4444ddb106eb9281299deb087d57df3aafe7f033
parent 20c815e5

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

+7 −5
Original line number Diff line number Diff line
@@ -760,6 +760,12 @@ public class MultiSimSettingController extends Handler { 
            boolean voiceSelected, boolean smsSelected) {

        int dialogType = EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_NONE;



        // Do not show preference selection dialog during SuW as there is fullscreen activity to

        // choose preference.

        if (Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.DEVICE_PROVISIONED, 0) == 0) {

            return dialogType;

        }

        // If a primary subscription is removed and only one is left active, ask user

        // for preferred sub selection if any default setting is not set.

        // If another primary subscription is added or default data is not selected, ask
@@ -768,12 +774,8 @@ public class MultiSimSettingController extends Handler { 
                && (!dataSelected || !smsSelected || !voiceSelected)) {

            dialogType = EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_ALL;

        } else if (mPrimarySubList.size() > 1 && (isUserVisibleChange(change)

                || (change == PRIMARY_SUB_INITIALIZED && !dataSelected

                && Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.DEVICE_PROVISIONED, 0) != 0))) {

                || (change == PRIMARY_SUB_INITIALIZED && !dataSelected))) {

            // If change is SWAPPED_IN_GROUP or MARKED_OPPT, don't ask user again.

            // In default DSDS devices, do not show data selection dialog during SuW as there is

            // fullscreen activity to choose data preference.

            dialogType = EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA;

        }