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

Commit a164ab03 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Fix some NPEs in shell transitions" into sc-v2-dev am: 2dd3adff am: 83135ec4 

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

Change-Id: I6b4ad7d4e25f3f491055bdf553814afe38d44ea9
parents 3c319bbb 83135ec4

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;

                }