Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d16dedf3 authored by Patrick Brady's avatar Patrick Brady Committed by Android Git Automerger
Browse files

am 67ebb2f8: am 957b27f6: Merge "Revert "Always show emergency button on... 

am 67ebb2f8: am 957b27f6: Merge "Revert "Always show emergency button on selector view screen in keyguard."  I\'m reverting for now while we sort out the actual requirements.  Sorry for the thrash, Jaggies.  I\'ll handle re-adding it if needed." into jb-mr1-dev

* commit '67ebb2f8':
  Revert "Always show emergency button on selector view screen in keyguard."  I'm reverting for now while we sort out the actual requirements.  Sorry for the thrash, Jaggies.  I'll handle re-adding it if needed.
parents 069b87cf 67ebb2f8

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

+1 −3
Original line number Diff line number Diff line
@@ -109,9 +109,7 @@ public class EmergencyButton extends Button { 
            } else {

                // True if we need to show a secure screen (pin/pattern/SIM pin/SIM puk);

                // hides emergency button on "Slide" screen if device is not secure.

                

                // XXX we decided to show this always.  See bug 7276760

                enabled = true || mLockPatternUtils.isSecure();

                enabled = mLockPatternUtils.isSecure();

            }

        }

        mLockPatternUtils.updateEmergencyCallButtonState(this, phoneState, enabled,