From 50151025fac89dafcebd7b38de943840076083a6 Mon Sep 17 00:00:00 2001 From: marziana Date: Thu, 22 Dec 2022 16:01:15 +0000 Subject: [PATCH] Solves ExitTransitionCoordinator.ExitTransitionCallbacks NPE Fixes: 262334298 Test: open the sample project app from the bug report, and execute `abd shell` commands: `input keyevent BACK`; `sleep 0.1`; `wm user-rotation lock 1` Change-Id: I9ad9b3b67f716fb9410e7ab39d0c8ee6df50161f --- core/java/android/app/ExitTransitionCoordinator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/app/ExitTransitionCoordinator.java b/core/java/android/app/ExitTransitionCoordinator.java index 930750e138f87..46c677de85f61 100644 --- a/core/java/android/app/ExitTransitionCoordinator.java +++ b/core/java/android/app/ExitTransitionCoordinator.java @@ -426,7 +426,7 @@ public class ExitTransitionCoordinator extends ActivityTransitionCoordinator { mSharedElementNotified = true; delayCancel(); - if (mExitCallbacks.isReturnTransitionAllowed()) { + if (mExitCallbacks != null && mExitCallbacks.isReturnTransitionAllowed()) { mResultReceiver.send(MSG_ALLOW_RETURN_TRANSITION, null); }