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

Commit 1aa65f3b authored by Sanket Padawe's avatar Sanket Padawe
Browse files

Fix build failure. 

+ Merge commit 'a049c988' into
manual_merge_a049c98

Test: Fixing merge conflict
Change-Id: I4eebc1352ec7274811118a71f8cf97c864771145
parents 23665b07 a049c988

src/com/android/settings/datausage/CellDataPreference.java

+9 −4
Original line number Diff line number Diff line
@@ -114,11 +114,10 @@ public class CellDataPreference extends CustomDialogPreference implements Templa 
        final Context context = getContext();

        FeatureFactory.getFactory(context).getMetricsFeatureProvider()

                .action(context, MetricsEvent.ACTION_CELL_DATA_TOGGLE, !mChecked);

        if (mChecked) {

        final SubscriptionInfo currentSir = mSubscriptionManager.getActiveSubscriptionInfo(

                mSubId);

        final SubscriptionInfo nextSir = mSubscriptionManager.getDefaultDataSubscriptionInfo();



        if (mChecked) {

            // If the device is single SIM or is enabling data on the active data SIM then forgo

            // the pop-up.

            if (!Utils.showSimCardTile(getContext()) ||
@@ -139,6 +138,12 @@ public class CellDataPreference extends CustomDialogPreference implements Templa 
            // If we are showing the Sim Card tile then we are a Multi-Sim device.

            if (Utils.showSimCardTile(getContext())) {

                mMultiSimDialog = true;

                if (nextSir != null && currentSir != null &&

                        currentSir.getSubscriptionId() == nextSir.getSubscriptionId()) {

                    setMobileDataEnabled(true);

                    disableDataForOtherSubscriptions(mSubId);

                    return;

                }

                super.performClick(view);

            } else {

                setMobileDataEnabled(true);