Merge "Fix NPE in setTransparentRegion."

Author: Craig Mautner

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

@@ -6919,8 +6919,6 @@ public void handleMessage(Message msg) {
                                 (Pair<WindowStateAnimator, Region>) msg.obj;
                     final WindowStateAnimator winAnimator = pair.first;
                     winAnimator.setTransparentRegionHint(pair.second);
-
-                    scheduleAnimationLocked();
                     break;
                 }
 

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

@@ -943,6 +943,10 @@ public void prepareSurfaceLocked(final boolean recoveringMemory) {
     }
 
     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();