Merge "Return STATUS_UNSUPPORTED if WindowAreaComponent is not supported" (5ae05a7b) · Commits · e / os / android_frameworks_base

libs/WindowManager/Jetpack/src/androidx/window/extensions/area/WindowAreaComponentImpl.java

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -263,8 +263,10 @@ public class WindowAreaComponentImpl implements WindowAreaComponent,
	return;		return;
	}		}
	@WindowAreaStatus int currentStatus = getCurrentRearDisplayPresentationModeStatus();		@WindowAreaStatus int currentStatus = getCurrentRearDisplayPresentationModeStatus();
			DisplayMetrics metrics =
			currentStatus == STATUS_UNSUPPORTED ? null : getRearDisplayMetrics();
	consumer.accept(		consumer.accept(
	new RearDisplayPresentationStatus(currentStatus, getRearDisplayMetrics()));		new RearDisplayPresentationStatus(currentStatus, metrics));
	}		}
	}		}

	@@ -408,6 +410,10 @@ public class WindowAreaComponentImpl implements WindowAreaComponent,

	@GuardedBy("mLock")		@GuardedBy("mLock")
	private int getCurrentRearDisplayModeStatus() {		private int getCurrentRearDisplayModeStatus() {
			if (mRearDisplayState == INVALID_DEVICE_STATE) {
			return WindowAreaComponent.STATUS_UNSUPPORTED;
			}

	if (mRearDisplaySessionStatus == WindowAreaComponent.SESSION_STATE_ACTIVE		if (mRearDisplaySessionStatus == WindowAreaComponent.SESSION_STATE_ACTIVE
	\|\| !ArrayUtils.contains(mCurrentSupportedDeviceStates, mRearDisplayState)		\|\| !ArrayUtils.contains(mCurrentSupportedDeviceStates, mRearDisplayState)
	\|\| isRearDisplayActive()) {		\|\| isRearDisplayActive()) {
	@@ -441,6 +447,10 @@ public class WindowAreaComponentImpl implements WindowAreaComponent,

	@GuardedBy("mLock")		@GuardedBy("mLock")
	private int getCurrentRearDisplayPresentationModeStatus() {		private int getCurrentRearDisplayPresentationModeStatus() {
			if (mConcurrentDisplayState == INVALID_DEVICE_STATE) {
			return WindowAreaComponent.STATUS_UNSUPPORTED;
			}

	if (mCurrentDeviceState == mConcurrentDisplayState		if (mCurrentDeviceState == mConcurrentDisplayState
	\|\| !ArrayUtils.contains(mCurrentSupportedDeviceStates, mConcurrentDisplayState)		\|\| !ArrayUtils.contains(mCurrentSupportedDeviceStates, mConcurrentDisplayState)
	\|\| isDeviceFolded()) {		\|\| isDeviceFolded()) {