Merge "Assist app is not launched when long-pressing on Home key"

This commit is contained in:
Adrian Roos
2016-12-15 23:51:11 +00:00
committed by Gerrit Code Review

View File

@@ -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() {