Fix build failure.

+ Merge commit 'a049c988e75a0bb496b587ade60930c4d40e4aaf' into
manual_merge_a049c98

Test: Fixing merge conflict
Change-Id: I4eebc1352ec7274811118a71f8cf97c864771145

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

@@ -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);