Skip to content

Commit 1f4e0cc

Browse files
author
Craig Mautner
committed
Fix NPE in setTransparentRegion.
Check for null Surface before using it. Fixes bug 6312835. Change-Id: Iaaac2a5d88e81b88e369815e09818c268085e4b7
1 parent 1ade5ae commit 1f4e0cc

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

services/java/com/android/server/wm/WindowManagerService.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6897,8 +6897,6 @@ public void handleMessage(Message msg) {
68976897
(Pair<WindowStateAnimator, Region>) msg.obj;
68986898
final WindowStateAnimator winAnimator = pair.first;
68996899
winAnimator.setTransparentRegionHint(pair.second);
6900-
6901-
scheduleAnimationLocked();
69026900
break;
69036901
}
69046902

services/java/com/android/server/wm/WindowStateAnimator.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -943,6 +943,10 @@ public void prepareSurfaceLocked(final boolean recoveringMemory) {
943943
}
944944

945945
void setTransparentRegionHint(final Region region) {
946+
if (mSurface == null) {
947+
Slog.w(TAG, "setTransparentRegionHint: null mSurface after mHasSurface true");
948+
return;
949+
}
946950
if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG,
947951
">>> OPEN TRANSACTION setTransparentRegion");
948952
Surface.openTransaction();

0 commit comments

Comments
 (0)