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

Commit 223ff6bd authored by Evan Rosky's avatar Evan Rosky
Browse files

Fix some NPEs in shell transitions 

Missed some null checks which resulted in crashes during some
tests.

Bug: 183993924
Test: atest WindowInsetsPolicyTest
Change-Id: Iaa84b2d9e824223cead9ba78247129b77b1f217e
parent 81b968f8

core/java/android/view/RemoteAnimationTarget.java

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ public class RemoteAnimationTarget implements Parcelable { 
        this.clipRect = new Rect(clipRect);

        this.contentInsets = new Rect(contentInsets);

        this.prefixOrderIndex = prefixOrderIndex;

        this.position = new Point(position);

        this.position = position == null ? new Point() : new Point(position);

        this.localBounds = new Rect(localBounds);

        this.sourceContainerBounds = new Rect(screenSpaceBounds);

        this.screenSpaceBounds = new Rect(screenSpaceBounds);

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

+1 −1
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
            // Wallpaper must be the top (regardless of how nested it is in DisplayAreas).

            boolean skipIntermediateReports = isWallpaper(wc);

            for (WindowContainer p = wc.getParent(); p != null; p = p.getParent()) {

                if (!p.isAttached() || !changes.get(p).hasChanged(p)) {

                if (!p.isAttached() || changes.get(p) == null || !changes.get(p).hasChanged(p)) {

                    // Again, we're skipping no-ops

                    break;

                }