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

Commit 9acb8f9b authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Fix IME back callback not being invoked for hardware back key" into main

parents 88440291 f4af10f0

core/java/android/view/ViewRootImpl.java

+7 −1
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ import android.window.ActivityWindowInfo; 
import android.window.BackEvent;

import android.window.ClientWindowFrames;

import android.window.CompatOnBackInvokedCallback;

import android.window.ImeBackCallbackProxy;

import android.window.InputTransferToken;

import android.window.OnBackAnimationCallback;

import android.window.OnBackInvokedCallback;
@@ -7791,7 +7792,12 @@ public final class ViewRootImpl implements ViewParent, 
                            return FORWARD;

                        }

                    } else if (mContext != null

                            && mOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled()) {

                            && (mOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled()

                            || mOnBackInvokedDispatcher.getTopCallback()

                            instanceof ImeBackAnimationController

                            || mOnBackInvokedDispatcher.getTopCallback()

                            instanceof ImeBackCallbackProxy.ImeOnBackInvokedCallback)

                    ) {

                        return doOnBackKeyEvent(keyEvent);

                    }

                }