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

b00c929394cb6bce158265af9606a8eb5a79e47a

Change-Id: I42d17262a789d2eb106a924b442a9d3debcc35e4

1 files changed, 4 insertions, 4 deletions

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPinViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPinViewController.java
index 3c29058e0afc..cc8bf4f2d028 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPinViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPinViewController.java
@@ -106,7 +106,7 @@ public class KeyguardSimPinViewController
 
     @Override
     public boolean startDisappearAnimation(Runnable finishRunnable) {
-        return mView.startDisappearAnimation(finishRunnable);
+        return false;
     }
 
     @Override
@@ -137,7 +137,7 @@ public class KeyguardSimPinViewController
             mMessageAreaController.setMessage(
                     com.android.systemui.R.string.kg_invalid_sim_pin_hint);
             mView.resetPasswordText(true /* animate */, true /* announce */);
-            mKeyguardSecurityCallback.userActivity();
+            getKeyguardSecurityCallback().userActivity();
             return;
         }
 
@@ -159,7 +159,7 @@ public class KeyguardSimPinViewController
                             mKeyguardUpdateMonitor.reportSimUnlocked(mSubId);
                             mRemainingAttempts = -1;
                             mShowDefaultMessage = true;
-                            mKeyguardSecurityCallback.dismiss(
+                            getKeyguardSecurityCallback().dismiss(
                                     true, KeyguardUpdateMonitor.getCurrentUser());
                         } else {
                             mShowDefaultMessage = false;
@@ -186,7 +186,7 @@ public class KeyguardSimPinViewController
                                         + " attemptsRemaining=" + result.getAttemptsRemaining());
                             }
                         }
-                        mKeyguardSecurityCallback.userActivity();
+                        getKeyguardSecurityCallback().userActivity();
                         mCheckSimPinThread = null;
                     });
                 }