summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kaori Katou <kaori.x.kato@sonymobile.com> 2016-08-04 17:11:07 +0900
committer Yoshinori Hirano <yoshinori.hirano@sonymobile.com> 2016-10-26 16:40:16 +0900
commit70554e01c64101bb7e5a511be328ae774a6f451c (patch)
tree88a3a7567dc49703026973eb73c52b84104db011
parent4d1c2922f067649ae1973f132b2e873c45dad718 (diff)
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
-rw-r--r--packages/SystemUI/src/com/android/systemui/assist/AssistManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
index a0aeb2ff7b77..b828c43930d7 100644
--- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
@@ -29,6 +29,7 @@ import android.widget.ImageView;
import com.android.internal.app.AssistUtils;
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;
@@ -259,7 +260,7 @@ public class AssistManager {
@Nullable
private ComponentName getAssistInfo() {
- return mAssistUtils.getAssistComponentForUser(UserHandle.USER_CURRENT);
+ return mAssistUtils.getAssistComponentForUser(KeyguardUpdateMonitor.getCurrentUser());
}
public void showDisclosure() {