From: Stuart Scott <stuartscott@google.com>
Date: Thu, 19 Mar 2015 23:02:09 +0000 (-0700)
Subject: Add null pointer check
X-Git-Tag: android-x86-6.0-r1~839
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=754b56690be41fe38fcb502da2eb0d8ec4d19200;p=android-x86%2Fpackages-apps-Settings.git

Add null pointer check

Change-Id: I5f364e8010d61162ed57148658965b9730491050
---

diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index 1fb27d361b..990f485ba7 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -100,7 +100,7 @@ public class ResetNetwork extends Fragment {
 
     private void showFinalConfirmation() {
         Bundle args = new Bundle();
-        if (mSubscriptions.size() > 0) {
+        if (mSubscriptions != null && mSubscriptions.size() > 0) {
             int selectedIndex = mSubscriptionSpinner.getSelectedItemPosition();
             SubscriptionInfo subscription = mSubscriptions.get(selectedIndex);
             args.putInt(PhoneConstants.SUBSCRIPTION_KEY, subscription.getSubscriptionId());