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

Commit ecf7a0af 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 am: 3047485e

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



Change-Id: Ia4d5bbf772b5684e8b330e1c65148ce1a753c0f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0557739d 3047485e

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

+5 −1
Original line number Original line 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.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);

        }

        }