commit ecfbe17684511a4e1dfd7b29c686479a79d37420
author xudiwen <xudiwen@xiaomi.com> Thu Jun 01 19:09:25 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 01 19:09:25 2017 +0000
tree 72ead3833ae4d9b0e75687cebb2cfa632a44cede
parent 42790ccd84c231bd52e7d5041f1097c1383e0667
parent 0ff0487b51b8e0738f147f72de8dcee6eff6a5da

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

Change-Id: I22cd436533a745a415a49122fe2469ef9a96cdc9

src/com/android/settings/IccLockSettings.java

diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index ef0f8b3..d7de8fb 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());
+            }
         }
     }