Merge "Check for mSurfaceController in setWallpaperPositionAndScale" into... (69ca2969) · Commits · e / os / android_frameworks_base

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

+18 −12

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

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

			return true;
			}

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