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

Commit d087e1e4 authored by Andy Wickham's avatar Andy Wickham Committed by Automerger Merge Worker
Browse files

Merge changes from topics "cherrypick-lock-task-1l1m9ziktkw",... 

Merge changes from topics "cherrypick-lock-task-1l1m9ziktkw", "cherrypicker-L23700030000857114:N48700030014533099" into udc-qpr-dev am: 8f40d44c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25565624



Change-Id: Ia7170256e0bc8e33fb674861090f383b7a16e429
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a840b41d 8f40d44c

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

+8 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.ActivityManager;

import android.app.ActivityOptions;

import android.app.SearchManager;

import android.content.ActivityNotFoundException;
@@ -144,6 +145,7 @@ public class AssistManager { 
    private final UserTracker mUserTracker;

    private final DisplayTracker mDisplayTracker;

    private final SecureSettings mSecureSettings;

    private final ActivityManager mActivityManager;



    private final DeviceProvisionedController mDeviceProvisionedController;
@@ -183,7 +185,8 @@ public class AssistManager { 
            @Main Handler uiHandler,

            UserTracker userTracker,

            DisplayTracker displayTracker,

            SecureSettings secureSettings) {

            SecureSettings secureSettings,

            ActivityManager activityManager) {

        mContext = context;

        mDeviceProvisionedController = controller;

        mCommandQueue = commandQueue;
@@ -195,6 +198,7 @@ public class AssistManager { 
        mUserTracker = userTracker;

        mDisplayTracker = displayTracker;

        mSecureSettings = secureSettings;

        mActivityManager = activityManager;



        registerVoiceInteractionSessionListener();

        registerVisualQueryRecognitionStatusListener();
@@ -266,6 +270,9 @@ public class AssistManager { 
    }



    public void startAssist(Bundle args) {

        if (mActivityManager.getLockTaskModeState() == ActivityManager.LOCK_TASK_MODE_LOCKED) {

            return;

        }

        if (shouldOverrideAssist(args)) {

            try {

                if (mOverviewProxyService.getProxy() == null) {