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

Commit 2dd3adff authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Fix some NPEs in shell transitions" into sc-v2-dev

parents 1cf149d1 223ff6bd

core/java/android/view/RemoteAnimationTarget.java

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

        this.clipRect = new Rect(clipRect);

        this.contentInsets = new Rect(contentInsets);

        this.contentInsets = new Rect(contentInsets);

        this.prefixOrderIndex = prefixOrderIndex;

        this.prefixOrderIndex = prefixOrderIndex;

        this.position = new Point(position);

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

        this.localBounds = new Rect(localBounds);

        this.localBounds = new Rect(localBounds);

        this.sourceContainerBounds = new Rect(screenSpaceBounds);

        this.sourceContainerBounds = new Rect(screenSpaceBounds);

        this.screenSpaceBounds = new Rect(screenSpaceBounds);

        this.screenSpaceBounds = new Rect(screenSpaceBounds);

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

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

            // Wallpaper must be the top (regardless of how nested it is in DisplayAreas).

            boolean skipIntermediateReports = isWallpaper(wc);

            boolean skipIntermediateReports = isWallpaper(wc);

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

            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

                    // Again, we're skipping no-ops

                    break;

                    break;

                }

                }