commit 64e23d81a5cc97fa85608bc5ff88d77077fe31ac
author Wei Sheng Shih <wilsonshih@google.com> Thu Jun 13 08:19:51 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 13 08:19:51 2024 +0000
tree 8dc30b3f4e54e98bc475fdcab3fa32bd52203d26
parent 1e8d0901d5f5da25435cf85e33bf7c12d3c36911
parent 3c9a3d4f7891183502796ad84c4ad6af53da1cca

Merge "Only clear shared starting data for starting window owner." into main

services/core/java/com/android/server/wm/ActivityRecord.java

diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index edc5696..5159fc4 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -2983,7 +2983,7 @@
 
     void removeStartingWindowAnimation(boolean prepareAnimation) {
         mTransferringSplashScreenState = TRANSFER_SPLASH_SCREEN_IDLE;
-        if (task != null) {
+        if (mStartingData != null && task != null) {
             task.mSharedStartingData = null;
         }
         if (mStartingWindow == null) {