Merge "Determine rear display status only based on device states" into udc-dev (9188aa60) · Commits · e / os / android_frameworks_base

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -414,8 +414,7 @@ public class WindowAreaComponentImpl implements WindowAreaComponent,
		return WindowAreaComponent.STATUS_UNAVAILABLE;
		}

		if (mRearDisplaySessionStatus == WindowAreaComponent.SESSION_STATE_ACTIVE
		\|\| isRearDisplayActive()) {
		if (isRearDisplayActive()) {
		return WindowAreaComponent.STATUS_ACTIVE;
		}

		@@ -537,7 +536,6 @@ public class WindowAreaComponentImpl implements WindowAreaComponent,
		if (request.equals(mRearDisplayStateRequest)) {
		mRearDisplaySessionStatus = WindowAreaComponent.SESSION_STATE_ACTIVE;
		mRearDisplaySessionCallback.accept(mRearDisplaySessionStatus);
		updateRearDisplayStatusListeners(getCurrentRearDisplayModeStatus());
		}
		}
		}
		@@ -550,7 +548,6 @@ public class WindowAreaComponentImpl implements WindowAreaComponent,
		}
		mRearDisplaySessionStatus = WindowAreaComponent.SESSION_STATE_INACTIVE;
		mRearDisplaySessionCallback.accept(mRearDisplaySessionStatus);
		updateRearDisplayStatusListeners(getCurrentRearDisplayModeStatus());
		}
		}
		}