Merge "Fix looping to turn off dimming."

Author: Craig Mautner

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

@@ -440,9 +440,12 @@ void animate() {
                 w.mWinAnimator.prepareSurfaceLocked(true);
             }
 
+            if (mDimParams != null) {
+                mDimAnimator.updateParameters(mContext.getResources(), mDimParams, mCurrentTime);
+            }
             if (mDimAnimator != null && mDimAnimator.mDimShown) {
-                mAnimating |= mDimAnimator.updateSurface(mService.mInnerFields.mDimming,
-                            mCurrentTime, !mService.okToDisplay());
+                mAnimating |= mDimAnimator.updateSurface(mDimParams != null, mCurrentTime,
+                        !mService.okToDisplay());
             }
 
             if (mService.mBlackFrame != null) {
@@ -453,10 +456,6 @@ void animate() {
                     mService.mBlackFrame.clearMatrix();
                 }
             }
-
-            if (mDimParams != null) {
-                mDimAnimator.updateParameters(mContext.getResources(), mDimParams, mCurrentTime);
-            }
         } catch (RuntimeException e) {
             Log.wtf(TAG, "Unhandled exception in Window Manager", e);
         } finally {

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

@@ -8428,7 +8428,7 @@ private final void performLayoutAndPlaceSurfacesLockedInner(
                     updateWallpaperVisibilityLocked();
                 }
             }
-            if (!mInnerFields.mDimming) {
+            if (!mInnerFields.mDimming && mAnimator.mDimParams != null) {
                 mAnimator.stopDimming();
             }
         } catch (RuntimeException e) {