From b5947e01270c5042f6050908e1582961fea3c325 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Thu, 14 May 2015 16:14:29 -0700 Subject: [PATCH] Prevent EmergencyDialer restart from Keyguard Fixes a flicker caused by clearing the emergency dialer task when it was already launched. Instead we now only clear activities on top of the dialer. Bug: 20728640 Change-Id: I8a1214c4726e4848587a81e9050a6ab63759b64f --- packages/Keyguard/src/com/android/keyguard/EmergencyButton.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java b/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java index 1cabcdfcb20b..e03f44971d1f 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())); } } -- 2.11.0