From ea1a4906ad0779ad32b4ce4ba09c0391106fe0aa Mon Sep 17 00:00:00 2001
From: marziana <marziana@google.com>
Date: Thu, 22 Dec 2022 16:01:15 +0000
Subject: [PATCH] Solves ExitTransitionCoordinator.ExitTransitionCallbacks NPE

Fix: 294912765
Test: See original change this was cherry picked from
Change-Id: I9ad9b3b67f716fb9410e7ab39d0c8ee6df50161f
(cherry picked from commit 50151025fac89dafcebd7b38de943840076083a6)
---
 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);
                 }