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

Commit 0f3e5453 authored by Kenneth Ford's avatar Kenneth Ford Committed by Automerger Merge Worker
Browse files

Merge "Return STATUS_UNSUPPORTED if WindowAreaComponent is not supported" into...

Merge "Return STATUS_UNSUPPORTED if WindowAreaComponent is not supported" into tm-qpr-dev am: 01d602bb

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



Change-Id: Id7e5fe9824788cfe17de752c5cd7478e872c4515
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62d877ab 01d602bb
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -187,6 +187,10 @@ public class WindowAreaComponentImpl implements WindowAreaComponent,

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

        if (mRearDisplaySessionStatus == WindowAreaComponent.SESSION_STATE_ACTIVE
                || isRearDisplayActive()) {
            return WindowAreaComponent.STATUS_UNAVAILABLE;