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

Commit b703d3e7 authored by Massimo Carli's avatar Massimo Carli Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE on TaskFragment" into udc-dev

parents d3283c51 45dc5fd6

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

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


        mTaskSupervisor.getActivityMetricsLogger().notifyActivityRemoved(this);

        mTaskSupervisor.mStoppingActivities.remove(this);

        mLetterboxUiController.destroy();

        waitingToShow = false;



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

        }



        mLetterboxUiController.destroy();



        if (!delayed) {

            updateReportedVisibilityLocked();

        }

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

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



        // We destroy the first opaque activity

        mActivity.setState(DESTROYED, "testing");

        mActivity.removeImmediately();



        // Check that updateInheritedLetterbox() is invoked again