From ed7bf5eecc2c0821341cdc566e0014e5d8cc82fe Mon Sep 17 00:00:00 2001 From: Kaori Katou Date: Thu, 4 Aug 2016 17:11:07 +0900 Subject: [PATCH] Assist app is not launched when long-pressing on Home key To get Assist component and launch it correctly, The proper userId should be passed to AssistUtils#getAssistComponentForUser(). Bug: 30777883 Test: manual - install LegacyAssistant app and long-press on Home key Change-Id: I9f18ffdd9fc893235d77ed8145a765736a679478 (cherry picked from commit 70554e01c64101bb7e5a511be328ae774a6f451c) --- .../src/com/android/systemui/assist/AssistManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java index 9eceeacc39681..c965067126fbf 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java @@ -31,6 +31,7 @@ import android.widget.ImageView; import com.android.internal.app.AssistUtils; import com.android.internal.app.IVoiceInteractionSessionListener; import com.android.internal.app.IVoiceInteractionSessionShowCallback; +import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.R; import com.android.systemui.statusbar.BaseStatusBar; import com.android.systemui.statusbar.CommandQueue; @@ -282,7 +283,7 @@ public class AssistManager { @Nullable private ComponentName getAssistInfo() { - return mAssistUtils.getAssistComponentForUser(UserHandle.USER_CURRENT); + return mAssistUtils.getAssistComponentForUser(KeyguardUpdateMonitor.getCurrentUser()); } public void showDisclosure() {