commit f0cabba38bcb1aefad191915e214e836fa5ed2bd
author Craig Mautner <cmautner@google.com> Tue Apr 10 14:33:07 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 10 14:33:07 2012 -0700
tree 20d24cf9e5c32f6d3651c65044b314f272a65ba8
parent cd2a3ea5c8aaca505452e3287b2ad30bbba0e8d1
parent 1f4e0ccba08e4abb55a38a8b5936dbb244475fb9

Merge "Fix NPE in setTransparentRegion."

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

diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index 86f4ca3..8d65dc3 100644
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -6919,8 +6919,6 @@
                                 (Pair<WindowStateAnimator, Region>) msg.obj;
                     final WindowStateAnimator winAnimator = pair.first;
                     winAnimator.setTransparentRegionHint(pair.second);
-
-                    scheduleAnimationLocked();
                     break;
                 }
 

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

diff --git a/services/java/com/android/server/wm/WindowStateAnimator.java b/services/java/com/android/server/wm/WindowStateAnimator.java
index 220f5e0..941a5e1 100644
--- a/services/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/java/com/android/server/wm/WindowStateAnimator.java
@@ -943,6 +943,10 @@
     }
 
     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();