Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3047485e authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Preventing from double remove starting window after Activity destoryed"... 

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

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



Change-Id: Ia49a5bbf8c8cb13c13143996ecd0e21c40e83eef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e2777d9a b9df9a61

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

+5 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; 
import static android.view.Choreographer.CALLBACK_INSETS_ANIMATION;

import static android.window.StartingWindowInfo.STARTING_WINDOW_TYPE_LEGACY_SPLASH_SCREEN;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.ActivityManager;

import android.app.ActivityTaskManager;
@@ -370,8 +371,11 @@ class SplashscreenWindowCreator extends AbsSplashWindowCreator { 
        mStartingWindowRecordManager.addRecord(taskId, tView);

    }



    private void removeWindowInner(View decorView, boolean hideView) {

    private void removeWindowInner(@NonNull View decorView, boolean hideView) {

        requestTopUi(false);

        if (!decorView.isAttachedToWindow()) {

            return;

        }

        if (hideView) {

            decorView.setVisibility(View.GONE);

        }