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

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

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

Change-Id: I8d0728a305bb9e443c4b9805bbb959f6db6c0a2a
This commit is contained in:
Evan Rosky
2021-09-02 20:55:13 +00:00
committed by Automerger Merge Worker
parent f8f3f805ad 2dd3adff43
commit 83135ec426
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/RemoteAnimationTarget.java
View File

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

2
services/core/java/com/android/server/wm/Transition.java
View File

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