Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Preventing from double remove starting window after Activity destoryed" into udc-dev am: b9df9a61b9

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23657536

Change-Id: Ia49a5bbf8c8cb13c13143996ecd0e21c40e83eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Sheng Shih
2023-06-13 04:23:23 +00:00
committed by Automerger Merge Worker
parent e2777d9a41 b9df9a61b9
commit 3047485ec7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenWindowCreator.java
View File

@@ -20,6 +20,7 @@ import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;
import static android.view.Choreographer.CALLBACK_INSETS_ANIMATION; import static android.view.Choreographer.CALLBACK_INSETS_ANIMATION;
import static android.window.StartingWindowInfo.STARTING_WINDOW_TYPE_LEGACY_SPLASH_SCREEN; import static android.window.StartingWindowInfo.STARTING_WINDOW_TYPE_LEGACY_SPLASH_SCREEN;
import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.ActivityTaskManager; import android.app.ActivityTaskManager;
@@ -370,8 +371,11 @@ class SplashscreenWindowCreator extends AbsSplashWindowCreator {
mStartingWindowRecordManager.addRecord(taskId, tView); mStartingWindowRecordManager.addRecord(taskId, tView);
} }
private void removeWindowInner(View decorView, boolean hideView) { private void removeWindowInner(@NonNull View decorView, boolean hideView) {
requestTopUi(false); requestTopUi(false);
if (!decorView.isAttachedToWindow()) {
return;
}
if (hideView) { if (hideView) {
decorView.setVisibility(View.GONE); decorView.setVisibility(View.GONE);
} }