From b6a1ea78b8c9e2c13d8fefad37c27f04bdca107c Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Thu, 11 Oct 2012 21:09:14 -0700 Subject: [PATCH] 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. This reverts commit 43c5b5568539dd1726fff75f7bee7eb481f87844 Change-Id: I2289658d3afaea9d1655b1811f49435de6c130e1 --- .../internal/policy/impl/keyguard/EmergencyButton.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/policy/src/com/android/internal/policy/impl/keyguard/EmergencyButton.java b/policy/src/com/android/internal/policy/impl/keyguard/EmergencyButton.java index b295f14a9b31a..203ba3c6a0712 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/EmergencyButton.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/EmergencyButton.java @@ -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,