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

Merge "Fix NPE on TaskFragment" into udc-dev am: b703d3e777 am: a282510ace

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

Change-Id: Idf50a72a7188abc0a4688c2a52ddc521254e250c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Massimo Carli
2023-06-05 12:26:50 +00:00
committed by Automerger Merge Worker
parent 22e65001f0 a282510ace
commit 9ce13dd292
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -4281,6 +4281,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
@@ -4350,8 +4351,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();
} }

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

@@ -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