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

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

Browse Source 
* commit 'ab88ad9381dda4afe59d00966cb783426f5f44a3':
  Fixed a Data Usage crash
This commit is contained in:
PauloftheWest
2014-12-10 21:24:59 +00:00
committed by Android Git Automerger
parent 0d04d8cbe8 ab88ad9381
commit 87015c0166
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() { private void handleMultiSimDataDialog() {
final SubscriptionInfo currentSir = getCurrentTabSubInfo(getActivity()); final Context context = getActivity();
final SubscriptionInfo currentSir = getCurrentTabSubInfo(context);
final SubscriptionInfo nextSir = mSubscriptionManager.getActiveSubscriptionInfo( final SubscriptionInfo nextSir = mSubscriptionManager.getActiveSubscriptionInfo(
mSubscriptionManager.getDefaultDataSubId()); 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); setMobileDataEnabled(true);
updateBody(); updateBody();
return; 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()); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle(R.string.sim_change_data_title); builder.setTitle(R.string.sim_change_data_title);
builder.setMessage(getActivity().getResources().getString(R.string.sim_change_data_message, 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() { builder.setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() {
@Override @Override