Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Return STATUS_ACTIVE when the rear mode is already enabled" into udc-dev

Browse Source
This commit is contained in:
Jiaming Liu
2023-04-13 15:17:23 +00:00
committed by Android (Google) Code Review
parent 1b4ebf404e e56c2bfb24
commit c24903a790
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,12 +129,9 @@ public class WindowAreaComponentImpl implements WindowAreaComponent,
* {@link WindowAreaComponent#STATUS_AVAILABLE} or
* {@link WindowAreaComponent#STATUS_UNAVAILABLE} if the feature is supported or not in that
* state respectively. When the rear display feature is triggered, the status is updated to be
* {@link WindowAreaComponent#STATUS_UNAVAILABLE}.
* {@link WindowAreaComponent#STATUS_ACTIVE}.
* TODO(b/240727590): Prefix with AREA_
*
* TODO(b/239833099): Add a STATUS_ACTIVE option to let apps know if a feature is currently
* enabled.
*
* @param consumer {@link Consumer} interested in receiving updates to the status of
* rear display mode.
*/
@@ -407,18 +404,21 @@ public class WindowAreaComponentImpl implements WindowAreaComponent,
}
}
@GuardedBy("mLock")
private int getCurrentRearDisplayModeStatus() {
if (mRearDisplayState == INVALID_DEVICE_STATE) {
return WindowAreaComponent.STATUS_UNSUPPORTED;
}
if (mRearDisplaySessionStatus == WindowAreaComponent.SESSION_STATE_ACTIVE
|| !ArrayUtils.contains(mCurrentSupportedDeviceStates, mRearDisplayState)
|| isRearDisplayActive()) {
if (!ArrayUtils.contains(mCurrentSupportedDeviceStates, mRearDisplayState)) {
return WindowAreaComponent.STATUS_UNAVAILABLE;
}
if (mRearDisplaySessionStatus == WindowAreaComponent.SESSION_STATE_ACTIVE
|| isRearDisplayActive()) {
return WindowAreaComponent.STATUS_ACTIVE;
}
return WindowAreaComponent.STATUS_AVAILABLE;
}