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

Commit 6332d16d 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:... 

Merge "Assist app is not launched when long-pressing on Home key" am: 1e41bb48 am: d81fde40 am: 272c84b5
am: 36f71871

Change-Id: I9b0a9ecb9efcf5036740191077d64da097ad82d9
parents 3bd405bd 36f71871

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

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,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;
@@ -284,7 +285,7 @@ public class AssistManager { 


    @Nullable

    private ComponentName getAssistInfo() {

        return mAssistUtils.getAssistComponentForUser(UserHandle.USER_CURRENT);

        return mAssistUtils.getAssistComponentForUser(KeyguardUpdateMonitor.getCurrentUser());

    }



    public void showDisclosure() {