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

Commit 166ceea0 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... 

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

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



Change-Id: I7c463d58d54e5d64b09545eac6d5cc5b703dd843
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f1b6d698 091cc4ea

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

            }

        }

    }