Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I3d8df7b1d0e174a5b6078183ea131b3c8cd6fd45
This commit is contained in:
TreeHugger Robot
2021-06-23 18:36:04 +00:00
committed by Automerger Merge Worker
parent 02363e4004 8890ec0d54
commit 97d85c8aef
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/policy/PhoneWindow.java
View File

@@ -70,12 +70,12 @@ import android.transition.TransitionInflater;
import android.transition.TransitionManager; import android.transition.TransitionManager;
import android.transition.TransitionSet; import android.transition.TransitionSet;
import android.util.AndroidRuntimeException; import android.util.AndroidRuntimeException;
import android.view.AttachedSurfaceControl;
import android.util.EventLog; import android.util.EventLog;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
import android.util.SparseArray; import android.util.SparseArray;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.AttachedSurfaceControl;
import android.view.ContextThemeWrapper; import android.view.ContextThemeWrapper;
import android.view.CrossWindowBlurListeners; import android.view.CrossWindowBlurListeners;
import android.view.Gravity; import android.view.Gravity;
@@ -3148,7 +3148,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
if (cb == null || isDestroyed()) { if (cb == null || isDestroyed()) {
result = false; result = false;
} else { } else {
sendCloseSystemWindows("search");
int deviceId = event.getDeviceId(); int deviceId = event.getDeviceId();
SearchEvent searchEvent = null; SearchEvent searchEvent = null;
if (deviceId != 0) { if (deviceId != 0) {