commit 1f4e0ccba08e4abb55a38a8b5936dbb244475fb9
author Craig Mautner <cmautner@google.com> Tue Apr 10 14:24:38 2012 -0700
committer Craig Mautner <cmautner@google.com> Tue Apr 10 14:24:38 2012 -0700
tree 12add2ae1fed7ee4b4846086fc30fc6133b28661
parent 1ade5ae9c812464f086f2151069781db1b27db2f

Fix NPE in setTransparentRegion.

Check for null Surface before using it.

Fixes bug 6312835.

Change-Id: Iaaac2a5d88e81b88e369815e09818c268085e4b7

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