diff options
| author | Adrian Roos <roosa@google.com> | 2015-04-21 19:47:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-21 19:47:43 +0000 |
| commit | fb52c73fb5507ecb1e4e71d5e73a3fde65bce94d (patch) | |
| tree | 512d7e239ee99cad682e67759a4e12efaa16bc29 /packages | |
| parent | e0ef7e8c60566bad4cbe0140b98e9b1ccef72929 (diff) | |
| parent | 0ab5742cf725654a7ce0e020dbea4c1d9bf7a2f7 (diff) | |
| download | frameworks_base-fb52c73fb5507ecb1e4e71d5e73a3fde65bce94d.zip frameworks_base-fb52c73fb5507ecb1e4e71d5e73a3fde65bce94d.tar.gz frameworks_base-fb52c73fb5507ecb1e4e71d5e73a3fde65bce94d.tar.bz2 | |
Merge "Clear emergency dialer task on launch"
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/EmergencyButton.java | 4 |
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() { |