Revert^2 "9/N Clean Up Keyguard Class Structure"

b00c929394cb6bce158265af9606a8eb5a79e47a

Change-Id: I42d17262a789d2eb106a924b442a9d3debcc35e4

1 files changed, 11 insertions, 2 deletions

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java
index 9b2166b04415..a87374939ba6 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java
@@ -69,7 +69,7 @@ public class KeyguardSimPukViewController
             if (simState == TelephonyManager.SIM_STATE_READY) {
                 mRemainingAttempts = -1;
                 mShowDefaultMessage = true;
-                mKeyguardSecurityCallback.dismiss(true, KeyguardUpdateMonitor.getCurrentUser());
+                getKeyguardSecurityCallback().dismiss(true, KeyguardUpdateMonitor.getCurrentUser());
             } else {
                 resetState();
             }
@@ -273,7 +273,7 @@ public class KeyguardSimPukViewController
                             mRemainingAttempts = -1;
                             mShowDefaultMessage = true;
 
-                            mKeyguardSecurityCallback.dismiss(
+                            getKeyguardSecurityCallback().dismiss(
                                     true, KeyguardUpdateMonitor.getCurrentUser());
                         } else {
                             mShowDefaultMessage = false;
@@ -362,6 +362,15 @@ public class KeyguardSimPukViewController
         return mRemainingAttemptsDialog;
     }
 
+    @Override
+    public void onPause() {
+        // dismiss the dialog.
+        if (mSimUnlockProgressDialog != null) {
+            mSimUnlockProgressDialog.dismiss();
+            mSimUnlockProgressDialog = null;
+        }
+    }
+
     /**
      * Since the IPC can block, we want to run the request in a separate thread
      * with a callback.