commit 0ff0487b51b8e0738f147f72de8dcee6eff6a5da
author xudiwen <xudiwen@xiaomi.com> Thu Jun 01 19:05:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 01 19:05:23 2017 +0000
tree e367155e1f21b7f4f6f8223a04b8103c7ac05741
parent 3b76c25ceef137eb9f4e248b09781e00a1958b56
parent 957c4d7720af8b48eace756643021bfffe164e9e

Merge "NullPointerException when running monkey test in IccLockSettings" am: 2c8d826b01
am: 957c4d7720

Change-Id: I6f872dc828e25a849cfa5f2a4c56961f94b63541

src/com/android/settings/IccLockSettings.java

diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 9d7f10a..b51bbfa 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -247,11 +247,15 @@
     }
 
     private void updatePreferences() {
-        mPinDialog.setEnabled(mPhone != null);
-        mPinToggle.setEnabled(mPhone != null);
+        if (mPinDialog != null) {
+            mPinDialog.setEnabled(mPhone != null);
+        }
+        if (mPinToggle != null) {
+            mPinToggle.setEnabled(mPhone != null);
 
-        if (mPhone != null) {
-            mPinToggle.setChecked(mPhone.getIccCard().getIccLockEnabled());
+            if (mPhone != null) {
+                mPinToggle.setChecked(mPhone.getIccCard().getIccLockEnabled());
+            }
         }
     }