am 18e9575: am 6dbf861: Fix for NPE with pattern recovery (issue 7341237)

* commit '18e9575cad3bfc5c764396a359f9c2f5193e96a9':
  Fix for NPE with pattern recovery (issue 7341237)

Author: Adam Cohen

policy/src/com/android/internal/policy/impl/keyguard/KeyguardAccountView.java

@@ -84,6 +84,9 @@ public KeyguardAccountView(Context context, AttributeSet attrs, int defStyle) {
     protected void onFinishInflate() {
         super.onFinishInflate();
 
+        // We always set a dummy NavigationManager to avoid null checks
+        mSecurityMessageDisplay = new KeyguardNavigationManager(null);
+
         mLogin = (EditText) findViewById(R.id.login);
         mLogin.setFilters(new InputFilter[] { new LoginFilter.UsernameFilterGeneric() } );
         mLogin.addTextChangedListener(this);
@@ -315,7 +318,8 @@ public void onResume() {
 
     @Override
     public void setSecurityMessageDisplay(SecurityMessageDisplay display) {
-        mSecurityMessageDisplay = display;    
+        mSecurityMessageDisplay = display;
+        reset();
     }
 }
 

policy/src/com/android/internal/policy/impl/keyguard/KeyguardNavigationManager.java

@@ -23,16 +23,20 @@ public class KeyguardNavigationManager implements SecurityMessageDisplay {
     private TextView mMessageArea;
 
     public KeyguardNavigationManager(TextView messageArea) {
-        mMessageArea = messageArea;
-        mMessageArea.setSelected(true); // Make marquee work
+        if (messageArea != null) {
+            mMessageArea = messageArea;
+            mMessageArea.setSelected(true); // Make marquee work
+        }
     }
 
     public void setMessage(CharSequence msg, boolean important) {
+        if (mMessageArea == null) return;
         mMessageArea.setText(msg);
         mMessageArea.announceForAccessibility(mMessageArea.getText());
     }
 
     public void setMessage(int resId, boolean important) {
+        if (mMessageArea == null) return;
         if (resId != 0) {
             mMessageArea.setText(resId);
             mMessageArea.announceForAccessibility(mMessageArea.getText());
@@ -42,6 +46,7 @@ public void setMessage(int resId, boolean important) {
     }
 
     public void setMessage(int resId, boolean important, Object... formatArgs) {
+        if (mMessageArea == null) return;
         if (resId != 0) {
             mMessageArea.setText(mMessageArea.getContext().getString(resId, formatArgs));
             mMessageArea.announceForAccessibility(mMessageArea.getText());

policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java

@@ -109,6 +109,9 @@ private void resetState() {
 
     @Override
     protected void onFinishInflate() {
+        // We always set a dummy NavigationManager to avoid null checks
+        mSecurityMessageDisplay = new KeyguardNavigationManager(null);
+
         mLockPatternUtils = new LockPatternUtils(mContext); // TODO: use common one
 
         final int quality = mLockPatternUtils.getKeyguardStoredPasswordQuality();
@@ -366,10 +369,10 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
     public void afterTextChanged(Editable s) {
     }
 
-
     @Override
     public void setSecurityMessageDisplay(SecurityMessageDisplay display) {
-        mSecurityMessageDisplay = display;    
+        mSecurityMessageDisplay = display;
+        reset();
     }
 }
 

policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java

@@ -111,6 +111,9 @@ public void setLockPatternUtils(LockPatternUtils utils) {
     protected void onFinishInflate() {
         super.onFinishInflate();
 
+        // We always set a dummy NavigationManager to avoid null checks
+        mSecurityMessageDisplay = new KeyguardNavigationManager(null);
+
         mLockPatternUtils = mLockPatternUtils == null
                 ? new LockPatternUtils(mContext) : mLockPatternUtils;
 
@@ -371,7 +374,8 @@ public KeyguardSecurityCallback getCallback() {
 
     @Override
     public void setSecurityMessageDisplay(SecurityMessageDisplay display) {
-        mSecurityMessageDisplay = display;    
+        mSecurityMessageDisplay = display;
+        reset();
     }
 }
 

policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPinView.java

@@ -76,6 +76,9 @@ public void setKeyguardCallback(KeyguardSecurityCallback callback) {
     protected void onFinishInflate() {
         super.onFinishInflate();
 
+        // We always set a dummy NavigationManager to avoid null checks
+        mSecurityMessageDisplay = new KeyguardNavigationManager(null);
+
         mPinEntry = (EditText) findViewById(R.id.sim_pin_entry);
         mPinEntry.setOnEditorActionListener(this);
         mPinEntry.addTextChangedListener(this);
@@ -110,9 +113,7 @@ protected boolean onRequestFocusInDescendants(int direction, Rect previouslyFocu
 
     public void reset() {
         // start fresh
-        if (mSecurityMessageDisplay != null) {
-            mSecurityMessageDisplay.setMessage(R.string.kg_sim_pin_instructions, true);
-        }
+        mSecurityMessageDisplay.setMessage(R.string.kg_sim_pin_instructions, true);
 
         // make sure that the number of entered digits is consistent when we
         // erase the SIM unlock code, including orientation changes.

policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPukView.java

@@ -107,9 +107,7 @@ void reset() {
             mPinText="";
             mPukText="";
             state = ENTER_PUK;
-            if (mSecurityMessageDisplay != null) {
-                mSecurityMessageDisplay.setMessage(R.string.kg_puk_enter_puk_hint, true);
-            }
+            mSecurityMessageDisplay.setMessage(R.string.kg_puk_enter_puk_hint, true);
             mSimPinEntry.requestFocus();
         }
     }
@@ -132,6 +130,9 @@ public void setKeyguardCallback(KeyguardSecurityCallback callback) {
     protected void onFinishInflate() {
         super.onFinishInflate();
 
+        // We always set a dummy NavigationManager to avoid null checks
+        mSecurityMessageDisplay = new KeyguardNavigationManager(null);
+
         mSimPinEntry = (TextView) findViewById(R.id.sim_pin_entry);
         mSimPinEntry.setOnEditorActionListener(this);
         mSimPinEntry.addTextChangedListener(this);