diff options
| author | Prem Kumar <premk@google.com> | 2014-12-09 02:25:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-09 02:25:15 +0000 |
| commit | 1e1251cc04ee9636721719aa0a13d94e15500258 (patch) | |
| tree | 760d70b72d6218c86966894fb94aa3a77b0e2283 /src | |
| parent | 1e3be7d9ce27cf5ee7df78c675603a628eb0023d (diff) | |
| parent | c29c58353679fc5df845bd9d565f7b421c5d9403 (diff) | |
| download | packages_apps_Settings-1e1251cc04ee9636721719aa0a13d94e15500258.tar.gz packages_apps_Settings-1e1251cc04ee9636721719aa0a13d94e15500258.tar.bz2 packages_apps_Settings-1e1251cc04ee9636721719aa0a13d94e15500258.zip | |
Merge "Fixed a SIM Cards crash." into lmp-mr1-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/sim/SimDialogActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java index cf3ccdf53..6aceb46c3 100644 --- a/src/com/android/settings/sim/SimDialogActivity.java +++ b/src/com/android/settings/sim/SimDialogActivity.java @@ -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() { |