am ab88ad93: Merge "Fixed a Data Usage crash" into lmp-mr1-dev (87015c01) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/DataUsageSummary.java

+11 −3

Original line number	Diff line number	Diff line
		@@ -1176,21 +1176,29 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
		};

		private void handleMultiSimDataDialog() {
		final SubscriptionInfo currentSir = getCurrentTabSubInfo(getActivity());
		final Context context = getActivity();
		final SubscriptionInfo currentSir = getCurrentTabSubInfo(context);
		final SubscriptionInfo nextSir = mSubscriptionManager.getActiveSubscriptionInfo(
		mSubscriptionManager.getDefaultDataSubId());

		if (currentSir.getSubscriptionId() == nextSir.getSubscriptionId()) {
		// If the device is single SIM or is enabling data on the active data SIM then forgo
		// the pop-up.
		if (!Utils.showSimCardTile(context) \|\|
		(nextSir != null && currentSir.getSubscriptionId() == nextSir.getSubscriptionId())) {
		setMobileDataEnabled(true);
		updateBody();
		return;
		}

		final String previousName = (nextSir == null)
		? context.getResources().getString(R.string.sim_selection_required_pref)
		: nextSir.getDisplayName().toString();

		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());

		builder.setTitle(R.string.sim_change_data_title);
		builder.setMessage(getActivity().getResources().getString(R.string.sim_change_data_message,
		currentSir.getDisplayName(), nextSir.getDisplayName()));
		currentSir.getDisplayName(), previousName));

		builder.setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() {
		@Override