Merge "Fix looping to turn off dimming." (030711c3) · Commits · e / os / android_frameworks_base

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

+5 −6

Original line number	Diff line number	Diff line
		@@ -440,9 +440,12 @@ public class WindowAnimator {
		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 @@ public class WindowAnimator {
		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 {

+1 −1

Original line number	Diff line number	Diff line
		@@ -8428,7 +8428,7 @@ public class WindowManagerService extends IWindowManager.Stub
		updateWallpaperVisibilityLocked();
		}
		}
		if (!mInnerFields.mDimming) {
		if (!mInnerFields.mDimming && mAnimator.mDimParams != null) {
		mAnimator.stopDimming();
		}
		} catch (RuntimeException e) {