Merge "Merge "Check for mSurfaceController in setWallpaperPositionAndScale"... (2479b93f) · Commits · e / os / android_frameworks_base

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

+18 −12

Original line number	Diff line number	Diff line
		@@ -1257,8 +1257,11 @@ class WindowStateAnimator {
		mYOffset = dy;
		mWallpaperScale = scale;

		if (mSurfaceController != null) {
		try {
		if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG, ">>> OPEN TRANSACTION setWallpaperOffset");
		if (SHOW_LIGHT_TRANSACTIONS) {
		Slog.i(TAG, ">>> OPEN TRANSACTION setWallpaperOffset");
		}
		mService.openSurfaceTransaction();
		setWallpaperPositionAndScale(dx, dy, scale, false);
		} catch (RuntimeException e) {
		@@ -1266,11 +1269,14 @@ class WindowStateAnimator {
		+ " pos=(" + dx + "," + dy + ")", e);
		} finally {
		mService.closeSurfaceTransaction("setWallpaperOffset");
		if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG,
		"<<< CLOSE TRANSACTION setWallpaperOffset");
		return true;
		if (SHOW_LIGHT_TRANSACTIONS) {
		Slog.i(TAG, "<<< CLOSE TRANSACTION setWallpaperOffset");
		}
		}
		}

		return true;
		}

		private void setWallpaperPositionAndScale(int dx, int dy, float scale,
		boolean recoveringMemory) {