From 306150025cd208bb91369da1155092e28c9eedc6 Mon Sep 17 00:00:00 2001 From: Shan Huang Date: Tue, 4 Apr 2023 01:32:16 +0000 Subject: [PATCH] DO NOT MERGE Add logging for when IOnBackInvokedCallback is null. It should never be null. We had a bug where the IME callback can be unexpectedly GC-ed and jam back nav. This is to verify if we need its fix ag/21301891 in QPR as well. Bug: 274911901 Test: atest WindowOnBackInvokedDispatcherTest Change-Id: Ic2a576655ca16577ca35f3544f5b26d4a0db8f90 --- core/java/android/window/WindowOnBackInvokedDispatcher.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/java/android/window/WindowOnBackInvokedDispatcher.java b/core/java/android/window/WindowOnBackInvokedDispatcher.java index 2b5e16fe48939..caec4bca9469b 100644 --- a/core/java/android/window/WindowOnBackInvokedDispatcher.java +++ b/core/java/android/window/WindowOnBackInvokedDispatcher.java @@ -291,6 +291,7 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher { mProgressAnimator.reset(); final OnBackInvokedCallback callback = mCallback.get(); if (callback == null) { + Log.d(TAG, "Trying to call onBackInvoked() on a null callback reference."); return; } callback.onBackInvoked();