Merge "Fix duplicate-call issues in remote-display-change" into tm-qpr-dev am:... (2cfe909b) · Commits · e / os / android_frameworks_base

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

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -530,13 +530,7 @@ public class DisplayRotation {
	private void startRemoteRotation(int fromRotation, int toRotation) {		private void startRemoteRotation(int fromRotation, int toRotation) {
	mDisplayContent.mRemoteDisplayChangeController.performRemoteDisplayChange(		mDisplayContent.mRemoteDisplayChangeController.performRemoteDisplayChange(
	fromRotation, toRotation, null /* newDisplayAreaInfo */,		fromRotation, toRotation, null /* newDisplayAreaInfo */,
	(appliedChange, transaction) -> {		(transaction) -> continueRotation(toRotation, transaction)
	final int newRotation = appliedChange != null
	? appliedChange.toRotation
	// Timeout occurred, use old rotation
	: fromRotation;
	continueRotation(newRotation, transaction);
	}
	);		);
	}		}

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -120,7 +120,7 @@ public class PhysicalDisplaySwitchTransitionLauncher {

	final boolean started = mDisplayContent.mRemoteDisplayChangeController		final boolean started = mDisplayContent.mRemoteDisplayChangeController
	.performRemoteDisplayChange(fromRotation, toRotation, newDisplayAreaInfo,		.performRemoteDisplayChange(fromRotation, toRotation, newDisplayAreaInfo,
	(appliedChange, transaction) -> continueDisplayUpdate(transaction));		this::continueDisplayUpdate);

	if (!started) {		if (!started) {
	markTransitionAsReady();		markTransitionAsReady();

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

+46 −60

Original line number	Original line	Diff line number	Diff line
	@@ -18,14 +18,15 @@ package com.android.server.wm;

	import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_CONFIGURATION;		import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_CONFIGURATION;

			import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.os.RemoteException;		import android.os.RemoteException;
			import android.util.Slog;
	import android.view.IDisplayChangeWindowCallback;		import android.view.IDisplayChangeWindowCallback;
	import android.window.DisplayAreaInfo;		import android.window.DisplayAreaInfo;
	import android.window.WindowContainerTransaction;		import android.window.WindowContainerTransaction;

	import com.android.internal.protolog.common.ProtoLog;		import com.android.internal.protolog.common.ProtoLog;
	import com.android.internal.util.function.pooled.PooledLambda;

	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.List;		import java.util.List;
	@@ -38,16 +39,16 @@ import java.util.List;
	*/		*/
	public class RemoteDisplayChangeController {		public class RemoteDisplayChangeController {

			private static final String TAG = "RemoteDisplayChangeController";

	private static final int REMOTE_DISPLAY_CHANGE_TIMEOUT_MS = 800;		private static final int REMOTE_DISPLAY_CHANGE_TIMEOUT_MS = 800;

	private final WindowManagerService mService;		private final WindowManagerService mService;
	private final int mDisplayId;		private final int mDisplayId;

	private boolean mIsWaitingForRemoteDisplayChange;		private final Runnable mTimeoutRunnable = this::onContinueTimedOut;
	private final Runnable mTimeoutRunnable = () -> {
	continueDisplayChange(null /* appliedChange /, null / transaction */);
	};

			// all remote changes that haven't finished yet.
	private final List<ContinueRemoteDisplayChangeCallback> mCallbacks = new ArrayList<>();		private final List<ContinueRemoteDisplayChangeCallback> mCallbacks = new ArrayList<>();

	public RemoteDisplayChangeController(WindowManagerService service, int displayId) {		public RemoteDisplayChangeController(WindowManagerService service, int displayId) {
	@@ -61,7 +62,7 @@ public class RemoteDisplayChangeController {
	* to perform in sync with the display change.		* to perform in sync with the display change.
	*/		*/
	public boolean isWaitingForRemoteDisplayChange() {		public boolean isWaitingForRemoteDisplayChange() {
	return mIsWaitingForRemoteDisplayChange;		return !mCallbacks.isEmpty();
	}		}

	/**		/**
	@@ -79,7 +80,6 @@ public class RemoteDisplayChangeController {
	if (mService.mDisplayChangeController == null) {		if (mService.mDisplayChangeController == null) {
	return false;		return false;
	}		}
	mIsWaitingForRemoteDisplayChange = true;
	mCallbacks.add(callback);		mCallbacks.add(callback);

	if (newDisplayAreaInfo != null) {		if (newDisplayAreaInfo != null) {
	@@ -95,78 +95,67 @@ public class RemoteDisplayChangeController {
	toRotation);		toRotation);
	}		}

	final RemoteDisplayChange change = new RemoteDisplayChange(fromRotation, toRotation,		final IDisplayChangeWindowCallback remoteCallback = createCallback(callback);
	newDisplayAreaInfo);
	final IDisplayChangeWindowCallback remoteCallback = createCallback(change);
	try {		try {
	mService.mDisplayChangeController.onDisplayChange(mDisplayId, fromRotation, toRotation,
	newDisplayAreaInfo, remoteCallback);

	mService.mH.removeCallbacks(mTimeoutRunnable);		mService.mH.removeCallbacks(mTimeoutRunnable);
	mService.mH.postDelayed(mTimeoutRunnable, REMOTE_DISPLAY_CHANGE_TIMEOUT_MS);		mService.mH.postDelayed(mTimeoutRunnable, REMOTE_DISPLAY_CHANGE_TIMEOUT_MS);
			mService.mDisplayChangeController.onDisplayChange(mDisplayId, fromRotation, toRotation,
			newDisplayAreaInfo, remoteCallback);
	return true;		return true;
	} catch (RemoteException e) {		} catch (RemoteException e) {
	mIsWaitingForRemoteDisplayChange = false;		Slog.e(TAG, "Exception while dispatching remote display-change", e);
			mCallbacks.remove(callback);
	return false;		return false;
	}		}
	}		}

	private void continueDisplayChange(@Nullable RemoteDisplayChange appliedChange,		private void onContinueTimedOut() {
	@Nullable WindowContainerTransaction transaction) {		Slog.e(TAG, "RemoteDisplayChange timed-out, UI might get messed-up after this.");
			// timed-out, so run all continue callbacks and clear the list
	synchronized (mService.mGlobalLock) {		synchronized (mService.mGlobalLock) {
	if (appliedChange != null) {		for (int i = 0; i < mCallbacks.size(); ++i) {
	ProtoLog.v(WM_DEBUG_CONFIGURATION,		mCallbacks.get(i).onContinueRemoteDisplayChange(null /* transaction */);
	"Received remote change for Display[%d], applied: [%dx%d, rot = %d]",		}
	mDisplayId,		mCallbacks.clear();
	appliedChange.displayAreaInfo != null ? appliedChange.displayAreaInfo		}
	.configuration.windowConfiguration.getMaxBounds().width() : -1,
	appliedChange.displayAreaInfo != null ? appliedChange.displayAreaInfo
	.configuration.windowConfiguration.getMaxBounds().height() : -1,
	appliedChange.toRotation);
	} else {
	ProtoLog.v(WM_DEBUG_CONFIGURATION, "Remote change for Display[%d]: timeout reached",
	mDisplayId);
	}		}

	mIsWaitingForRemoteDisplayChange = false;		private void continueDisplayChange(@NonNull ContinueRemoteDisplayChangeCallback callback,
			@Nullable WindowContainerTransaction transaction) {
	for (int i = 0; i < mCallbacks.size(); i++) {		synchronized (mService.mGlobalLock) {
	ContinueRemoteDisplayChangeCallback callback = mCallbacks.get(i);		int idx = mCallbacks.indexOf(callback);
	callback.onContinueRemoteDisplayChange(appliedChange, transaction);		if (idx < 0) {
			// already called this callback or a more-recent one (eg. via timeout)
			return;
			}
			for (int i = 0; i < idx; ++i) {
			// Expect remote callbacks in order. If they don't come in order, then force
			// ordering by continuing everything up until this one with empty transactions.
			mCallbacks.get(i).onContinueRemoteDisplayChange(null /* transaction */);
			}
			mCallbacks.subList(0, idx + 1).clear();
			if (mCallbacks.isEmpty()) {
			mService.mH.removeCallbacks(mTimeoutRunnable);
	}		}
			callback.onContinueRemoteDisplayChange(transaction);
	}		}
	}		}

	private IDisplayChangeWindowCallback createCallback(RemoteDisplayChange originalChange) {		private IDisplayChangeWindowCallback createCallback(
			@NonNull ContinueRemoteDisplayChangeCallback callback) {
	return new IDisplayChangeWindowCallback.Stub() {		return new IDisplayChangeWindowCallback.Stub() {
	@Override		@Override
	public void continueDisplayChange(WindowContainerTransaction t) {		public void continueDisplayChange(WindowContainerTransaction t) {
	synchronized (mService.mGlobalLock) {		synchronized (mService.mGlobalLock) {
	mService.mH.removeCallbacks(mTimeoutRunnable);		if (!mCallbacks.contains(callback)) {
	mService.mH.sendMessage(PooledLambda.obtainMessage(		// already ran this callback or a more-recent one.
	RemoteDisplayChangeController::continueDisplayChange,		return;
	RemoteDisplayChangeController.this,
	originalChange, t));
	}		}
			mService.mH.post(() -> RemoteDisplayChangeController.this
			.continueDisplayChange(callback, t));
	}		}
	};
	}

	/**
	* Data class that contains information about a remote display change
	*/
	public static class RemoteDisplayChange {
	final int fromRotation;
	final int toRotation;
	@Nullable
	final DisplayAreaInfo displayAreaInfo;

	public RemoteDisplayChange(int fromRotation, int toRotation,
	@Nullable DisplayAreaInfo displayAreaInfo) {
	this.fromRotation = fromRotation;
	this.toRotation = toRotation;
	this.displayAreaInfo = displayAreaInfo;
	}		}
			};
	}		}

	/**		/**
	@@ -175,11 +164,8 @@ public class RemoteDisplayChangeController {
	public interface ContinueRemoteDisplayChangeCallback {		public interface ContinueRemoteDisplayChangeCallback {
	/**		/**
	* This method is called when the remote display change has been applied		* This method is called when the remote display change has been applied
	* @param appliedChange the change that was applied or null if there was
	* an error during remote display change (e.g. timeout)
	* @param transaction window changes collected by the remote display change		* @param transaction window changes collected by the remote display change
	*/		*/
	void onContinueRemoteDisplayChange(@Nullable RemoteDisplayChange appliedChange,		void onContinueRemoteDisplayChange(@Nullable WindowContainerTransaction transaction);
	@Nullable WindowContainerTransaction transaction);
	}		}
	}		}