Merge "Fixed build breakage caused by AOSP submission http://go/oag/c/143360" (e7f931c4) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/DimLayer.java

+4 −11

Original line number	Diff line number	Diff line
		@@ -168,27 +168,20 @@ public class DimLayer {
		mLastBounds.set(mBounds);
		}

		/**
		* @param bounds The new bounds to set
		* @param inTransaction Whether the call is made within a surface transaction.
		*/
		void setBounds(Rect bounds, boolean inTransaction) {
		/** @param bounds The new bounds to set */
		void setBounds(Rect bounds) {
		mBounds.set(bounds);
		if (isDimming() && !mLastBounds.equals(bounds)) {
		try {
		if (!inTransaction) {
		SurfaceControl.openTransaction();
		}
		adjustBounds();
		} catch (RuntimeException e) {
		Slog.w(TAG, "Failure setting size", e);
		} finally {
		if (!inTransaction) {
		SurfaceControl.closeTransaction();
		}
		}
		}
		}

		/**
		* @param duration The time to test.

+2 −2

Original line number	Diff line number	Diff line
		@@ -157,8 +157,8 @@ public class TaskStack {
		return false;
		}

		mDimLayer.setBounds(bounds, false);
		mAnimationBackgroundSurface.setBounds(bounds, false);
		mDimLayer.setBounds(bounds);
		mAnimationBackgroundSurface.setBounds(bounds);
		mBounds.set(bounds);
		mRotation = rotation;
		updateOverrideConfiguration();