diff options
| author | Adrian Roos <roosa@google.com> | 2015-05-18 23:48:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-18 23:48:15 +0000 |
| commit | 7034954f91c94b0f07db1417a016ec9d6f7775ec (patch) | |
| tree | 5eec7314745ffdcd2b6b5cf0f590a9c3c8cd1eae /packages/Keyguard | |
| parent | 63b007e651f7b487b09f42f13fe03e0327edea6f (diff) | |
| parent | b5947e01270c5042f6050908e1582961fea3c325 (diff) | |
| download | frameworks_base-7034954f91c94b0f07db1417a016ec9d6f7775ec.zip frameworks_base-7034954f91c94b0f07db1417a016ec9d6f7775ec.tar.gz frameworks_base-7034954f91c94b0f07db1417a016ec9d6f7775ec.tar.bz2 | |
Merge "Prevent EmergencyDialer restart from Keyguard" into mnc-dev
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())); } } |