PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 87015c01: am ab88ad93: Merge "Fixed a Data Usage crash" into lmp-mr1-dev

Browse Source 
automerge: 6a8b163

* commit '6a8b1634c053192d2abfdd8f1e0f5df9aecbf216':
  Fixed a Data Usage crash
This commit is contained in:
PauloftheWest
2014-12-11 00:11:24 +00:00
committed by android-build-merger
parent 4b9be76b1d 6a8b1634c0
commit fe3b679090
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/DataUsageSummary.java
View File

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