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

Commit 97d85c8a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove Intent.ACSD from KEYCODE_SEARCH action in-app" into sc-dev am: 8890ec0d 

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

Change-Id: I3d8df7b1d0e174a5b6078183ea131b3c8cd6fd45
parents 02363e40 8890ec0d

core/java/com/android/internal/policy/PhoneWindow.java

+1 −2
Original line number Diff line number Diff line
@@ -70,12 +70,12 @@ import android.transition.TransitionInflater; 
import android.transition.TransitionManager;

import android.transition.TransitionSet;

import android.util.AndroidRuntimeException;

import android.view.AttachedSurfaceControl;

import android.util.EventLog;

import android.util.Log;

import android.util.Pair;

import android.util.SparseArray;

import android.util.TypedValue;

import android.view.AttachedSurfaceControl;

import android.view.ContextThemeWrapper;

import android.view.CrossWindowBlurListeners;

import android.view.Gravity;
@@ -3148,7 +3148,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
        if (cb == null || isDestroyed()) {

            result = false;

        } else {

            sendCloseSystemWindows("search");

            int deviceId = event.getDeviceId();

            SearchEvent searchEvent = null;

            if (deviceId != 0) {