Merge "Fix SIM PIN listener registration" into qt-dev

packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java

@@ -135,7 +135,6 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
             return;
         }
 
-
         // Sending empty PIN here to query the number of remaining PIN attempts
         new CheckSimPin("", mSubId) {
             void onSimCheckResponse(final int result, final int attemptsRemaining) {
@@ -216,22 +215,17 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
     }
 
     @Override
-    protected void onAttachedToWindow() {
+    public void showUsabilityHint() {
-        super.onAttachedToWindow();
+
+    }
+
+    @Override
+    public void onResume(int reason) {
+        super.onResume(reason);
         KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mUpdateMonitorCallback);
         resetState();
     }
 
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mUpdateMonitorCallback);
-    }
-
-    @Override
-    public void showUsabilityHint() {
-    }
-
     @Override
     public void onPause() {
         // dismiss the dialog.
@@ -239,6 +233,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
             mSimUnlockProgressDialog.dismiss();
             mSimUnlockProgressDialog = null;
         }
+        KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mUpdateMonitorCallback);
     }
 
     /**