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

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

Merge "Determine rear display status only based on device states" into udc-dev am: 9188aa60 

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



Change-Id: Ie4da5d1c0266ae2ade1bb0e4b277267b18e37c37
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 259a4f92 9188aa60

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());

            }

        }

    }