Merge "Add null pointer check"

2015-03-19 21:57:32 +00:00
parent 60a09ea238 9302830fd0
commit 71791ad272
1 changed files with 1 additions and 1 deletions
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -140,7 +140,7 @@ public class ResetNetwork extends Fragment {
        mSubscriptionSpinner = (Spinner) mContentView.findViewById(R.id.reset_network_subscription);

        mSubscriptions = SubscriptionManager.from(getActivity()).getActiveSubscriptionInfoList();
-        if (mSubscriptions.size() > 0) {
+        if (mSubscriptions != null && mSubscriptions.size() > 0) {
            // Get the default subscription in the order of data, voice, sms, first up.
            int defaultSubscription = SubscriptionManager.getDefaultDataSubId();
            if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) {