commit 2c8d826b0135d0149f29a56db6f55ab4caf212c0
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 01 18:51:43 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 01 18:51:44 2017 +0000
tree 1f39862b25bf1c631f88641c0d70e5d7b44a045a
parent 79694e79d1368f763d2179239fa8ccf3fd13a507
parent 18615600ae6e23ffd12442fa6a2dba83b58c7fb2

Merge "NullPointerException when running monkey test in IccLockSettings"

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());
+            }
         }
     }