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

Commit 79f86603 authored by sandeepjs's avatar sandeepjs Committed by Automerger Merge Worker
Browse files

Avoid Showing Dialog in SetUpWizard. am: 32708fbc am: 00e8bad0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/19025267



Change-Id: Ib9f37b2ed6098ae85526d699306ccdddafdddef0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6e90142 00e8bad0

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;

        }