Merge "Return STATUS_UNSUPPORTED if WindowAreaComponent is not supported" into tm-qpr-dev

This commit is contained in:
Kenneth Ford
2023-03-14 20:38:57 +00:00
committed by Android (Google) Code Review

View File

@@ -187,6 +187,10 @@ public class WindowAreaComponentImpl implements WindowAreaComponent,
@GuardedBy("mLock") @GuardedBy("mLock")
private int getCurrentStatus() { private int getCurrentStatus() {
if (mRearDisplayState == INVALID_DEVICE_STATE) {
return WindowAreaComponent.STATUS_UNSUPPORTED;
}
if (mRearDisplaySessionStatus == WindowAreaComponent.SESSION_STATE_ACTIVE if (mRearDisplaySessionStatus == WindowAreaComponent.SESSION_STATE_ACTIVE
|| isRearDisplayActive()) { || isRearDisplayActive()) {
return WindowAreaComponent.STATUS_UNAVAILABLE; return WindowAreaComponent.STATUS_UNAVAILABLE;