diff options
| author | Adrian Roos <roosa@google.com> | 2015-05-18 23:56:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-18 23:56:56 +0000 |
| commit | 35e3db744e0f79a9ed84cfc97997abc371f1d3dd (patch) | |
| tree | 941686bf2ac0fcec21a8c39ea96f5e468918bb30 /packages/Keyguard | |
| parent | c3aa249f3c87250f2c9e203a75771d4b1df43153 (diff) | |
| parent | 7034954f91c94b0f07db1417a016ec9d6f7775ec (diff) | |
| download | frameworks_base-35e3db744e0f79a9ed84cfc97997abc371f1d3dd.zip frameworks_base-35e3db744e0f79a9ed84cfc97997abc371f1d3dd.tar.gz frameworks_base-35e3db744e0f79a9ed84cfc97997abc371f1d3dd.tar.bz2 | |
am 7034954f: Merge "Prevent EmergencyDialer restart from Keyguard" into mnc-dev
* commit '7034954f91c94b0f07db1417a016ec9d6f7775ec':
Prevent EmergencyDialer restart from Keyguard
Diffstat (limited to 'packages/Keyguard')
| -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 1cabcdf..e03f449 100644 --- a/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java +++ b/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java @@ -16,6 +16,7 @@ package com.android.keyguard; +import android.app.ActivityOptions; import android.content.Context; import android.content.Intent; import android.content.res.Configuration; @@ -42,7 +43,7 @@ public class EmergencyButton extends Button { .setPackage("com.android.phone") .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS - | Intent.FLAG_ACTIVITY_CLEAR_TASK); + | Intent.FLAG_ACTIVITY_CLEAR_TOP); KeyguardUpdateMonitorCallback mInfoCallback = new KeyguardUpdateMonitorCallback() { @@ -127,6 +128,7 @@ public class EmergencyButton extends Button { KeyguardUpdateMonitor.getInstance(mContext).reportEmergencyCallAction( true /* bypassHandler */); getContext().startActivityAsUser(INTENT_EMERGENCY_DIAL, + ActivityOptions.makeCustomAnimation(getContext(), 0, 0).toBundle(), new UserHandle(KeyguardUpdateMonitor.getCurrentUser())); } } |