Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 272c84b5 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "Assist app is not launched when long-pressing on Home key" am: 1e41bb48 

am: d81fde40

Change-Id: Ia8f58cfa1945a7ad627889545a264c9d1fb06beb
parents 80fba493 d81fde40

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

+2 −1
Original line number Diff line number Diff line
@@ -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() {