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

Commit fdb6be8b authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Always show emergency button on selector view screen in keyguard." into jb-mr1-dev

parents 87afd6eb 43c5b556
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -109,7 +109,9 @@ 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.
                enabled = mLockPatternUtils.isSecure();
                
                // XXX we decided to show this always.  See bug 7276760
                enabled = true || mLockPatternUtils.isSecure();
            }
        }
        mLockPatternUtils.updateEmergencyCallButtonState(this, phoneState, enabled,