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

Fixed a Data Usage crash

Browse Source 
Bug: 18364933
Change-Id: I80657c6541aec0b4706ef4aa229c9f858776aab2
This commit is contained in:
PauloftheWest
2014-12-10 08:50:54 -08:00
parent e0f637a66b
commit f0d84e2e53
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