am 35b3257e: am 1e1251cc: Merge "Fixed a SIM Cards crash." into lmp-mr1-dev

automerge: 5c8dff3

* commit '5c8dff3e92105dfa861cb2fb1bde8b57fea6e381':
  Fixed a SIM Cards crash.
This commit is contained in:
Prem Kumar
2014-12-09 23:17:07 +00:00
committed by android-build-merger

View File

@@ -152,7 +152,7 @@ public class SimDialogActivity extends Activity {
final SubscriptionManager subscriptionManager = SubscriptionManager.from(context);
final List<SubscriptionInfo> subInfoList =
subscriptionManager.getActiveSubscriptionInfoList();
final int selectableSubInfoLength = subInfoList.size();
final int selectableSubInfoLength = subInfoList == null ? 0 : subInfoList.size();
final DialogInterface.OnClickListener selectionListener =
new DialogInterface.OnClickListener() {