commit 36f718717d2d5542d159574d63a4194a69563aa7
author Adrian Roos <roosa@google.com> Fri Dec 16 01:42:10 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 16 01:42:10 2016 +0000
tree 8a07b2de9534108f9ea509febaf76d6fb2eed54a
parent ee05b648c7b0a828e19a0beef6e044bbc23351dd
parent 272c84b5be8ad0276f59cd5c9b6f31b632dec8da

Merge "Assist app is not launched when long-pressing on Home key" am: 1e41bb4887 am: d81fde40ef
am: 272c84b5be

Change-Id: I26c24879b6fb013ac477eb649d97d0411fd0da46

packages/SystemUI/src/com/android/systemui/assist/AssistManager.java

diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
index 9eceeac..c965067 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 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 @@
 
     @Nullable
     private ComponentName getAssistInfo() {
-        return mAssistUtils.getAssistComponentForUser(UserHandle.USER_CURRENT);
+        return mAssistUtils.getAssistComponentForUser(KeyguardUpdateMonitor.getCurrentUser());
     }
 
     public void showDisclosure() {