Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd50603c authored by Jiaming Liu's avatar Jiaming Liu Committed by Automerger Merge Worker
Browse files

Merge "Return STATUS_ACTIVE when the rear mode is already enabled" into... 

Merge "Return STATUS_ACTIVE when the rear mode is already enabled" into udc-dev am: c24903a7 am: e2ec864b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21932595



Change-Id: I3a2d8bf81667487fbf85340cba9901403dc8577c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9c230227 e2ec864b

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

+7 −7
Original line number Diff line number Diff line
@@ -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 (!ArrayUtils.contains(mCurrentSupportedDeviceStates, mRearDisplayState)) {

            return WindowAreaComponent.STATUS_UNAVAILABLE;

        }



        if (mRearDisplaySessionStatus == WindowAreaComponent.SESSION_STATE_ACTIVE

                || !ArrayUtils.contains(mCurrentSupportedDeviceStates, mRearDisplayState)

                || isRearDisplayActive()) {

            return WindowAreaComponent.STATUS_UNAVAILABLE;

            return WindowAreaComponent.STATUS_ACTIVE;

        }



        return WindowAreaComponent.STATUS_AVAILABLE;

    }