drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in setTransparentRegion."

Browse Source
This commit is contained in:
Craig Mautner
2012-04-10 14:33:07 -07:00
committed by Android (Google) Code Review
parent cd2a3ea5c8 1f4e0ccba0
commit f0cabba38b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/wm/WindowManagerService.java
View File

@ -6919,8 +6919,6 @@ public class WindowManagerService extends IWindowManager.Stub
(Pair<WindowStateAnimator, Region>) msg.obj;
final WindowStateAnimator winAnimator = pair.first;
winAnimator.setTransparentRegionHint(pair.second);
scheduleAnimationLocked();
break;
}

4
services/java/com/android/server/wm/WindowStateAnimator.java
View File

@ -943,6 +943,10 @@ class WindowStateAnimator {
}
void setTransparentRegionHint(final Region region) {
if (mSurface == null) {
Slog.w(TAG, "setTransparentRegionHint: null mSurface after mHasSurface true");
return;
}
if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG,
">>> OPEN TRANSACTION setTransparentRegion");
Surface.openTransaction();