Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Patrick Brady
2012-10-11 23:04:34 -07:00
committed by Android (Google) Code Review
parent a1ecd5a30c b6a1ea78b8
commit 957b27f62b
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
policy/src/com/android/internal/policy/impl/keyguard/EmergencyButton.java
View File

@@ -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,