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

Browse Source
This commit is contained in:
Evan Rosky
2021-09-02 20:43:51 +00:00
committed by Android (Google) Code Review
parent 1cf149d1a6 223ff6bd39
commit 2dd3adff43
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.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);

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). // 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;
} }