summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard/src
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-04-20 13:57:06 -0700
committerAdrian Roos <roosa@google.com>2015-04-21 12:35:11 -0700
commit0ab5742cf725654a7ce0e020dbea4c1d9bf7a2f7 (patch)
tree2438924bc49409ba4b5a5e74299336eb54bb03b2 /packages/Keyguard/src
parent994349c61e8697e626a7cd2b241a16b2b7669305 (diff)
downloadframeworks_base-0ab5742cf725654a7ce0e020dbea4c1d9bf7a2f7.zip
frameworks_base-0ab5742cf725654a7ce0e020dbea4c1d9bf7a2f7.tar.gz
frameworks_base-0ab5742cf725654a7ce0e020dbea4c1d9bf7a2f7.tar.bz2
Clear emergency dialer task on launch
Bug: 20344056 Change-Id: Ic26f003acad3f9f91d772e5b4be8bd4b8aff5ec8
Diffstat (limited to 'packages/Keyguard/src')
-rw-r--r--packages/Keyguard/src/com/android/keyguard/EmergencyButton.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java b/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java
index 7d5bf6b..1699809 100644
--- a/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java
+++ b/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java
@@ -39,7 +39,9 @@ public class EmergencyButton extends Button {
private static final Intent INTENT_EMERGENCY_DIAL = new Intent()
.setAction("com.android.phone.EmergencyDialer.DIAL")
.setPackage("com.android.phone")
- .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+ .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+ | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
+ | Intent.FLAG_ACTIVITY_CLEAR_TASK);
KeyguardUpdateMonitorCallback mInfoCallback = new KeyguardUpdateMonitorCallback() {