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

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

Merge "Remove exception for trying to close sessions that aren't active" into... 

Merge "Remove exception for trying to close sessions that aren't active" into udc-qpr-dev am: 72b66e8d

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



Change-Id: Ie6b90268d2bd39c3e5d4ab0db6531c632e57b231
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6451fb6c 72b66e8d

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

+0 −7
Original line number Diff line number Diff line
@@ -213,9 +213,6 @@ public class WindowAreaComponentImpl implements WindowAreaComponent, 
            if (mRearDisplayStateRequest != null || isRearDisplayActive()) {

                mRearDisplayStateRequest = null;

                mDeviceStateManager.cancelStateRequest();

            } else {

                throw new IllegalStateException(

                        "Unable to cancel a rear display session as there is no active session");

            }

        }

    }
@@ -432,10 +429,6 @@ public class WindowAreaComponentImpl implements WindowAreaComponent, 
        synchronized (mLock) {

            if (mRearDisplayPresentationController != null) {

                mDeviceStateManager.cancelStateRequest();

            } else {

                throw new IllegalStateException(

                        "Unable to cancel a rear display presentation session as there is no "

                                + "active session");

            }

        }

    }