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

Commit 19aefdf8 authored by Massimo Carli's avatar Massimo Carli Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE on TaskFragment" into udc-dev am: b703d3e7 am: c048685d 

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



Change-Id: I2ff674c1a9e659a2f81132134744ad1e7b15cb00
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 83ebcf45 c048685d

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -4295,6 +4295,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 




        mTaskSupervisor.getActivityMetricsLogger().notifyActivityRemoved(this);

        mTaskSupervisor.getActivityMetricsLogger().notifyActivityRemoved(this);

        mTaskSupervisor.mStoppingActivities.remove(this);

        mTaskSupervisor.mStoppingActivities.remove(this);

        mLetterboxUiController.destroy();

        waitingToShow = false;

        waitingToShow = false;





        // Defer removal of this activity when either a child is animating, or app transition is on

        // Defer removal of this activity when either a child is animating, or app transition is on
@@ -4364,8 +4365,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            mWmService.updateFocusedWindowLocked(UPDATE_FOCUS_NORMAL, true /*updateInputWindows*/);

            mWmService.updateFocusedWindowLocked(UPDATE_FOCUS_NORMAL, true /*updateInputWindows*/);

        }

        }





        mLetterboxUiController.destroy();



        if (!delayed) {

        if (!delayed) {

            updateReportedVisibilityLocked();

            updateReportedVisibilityLocked();

        }

        }

services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -407,7 +407,6 @@ public class SizeCompatTests extends WindowTestsBase { 
        clearInvocations(translucentActivity.mLetterboxUiController);

        clearInvocations(translucentActivity.mLetterboxUiController);





        // We destroy the first opaque activity

        // We destroy the first opaque activity

        mActivity.setState(DESTROYED, "testing");

        mActivity.removeImmediately();

        mActivity.removeImmediately();





        // Check that updateInheritedLetterbox() is invoked again

        // Check that updateInheritedLetterbox() is invoked again