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

Commit 5001627c authored by Yi Jiang's avatar Yi Jiang Committed by Automerger Merge Worker
Browse files

Merge "Don't cancel the previous request if it's fulfilled." into sc-dev am:... 

Merge "Don't cancel the previous request if it's fulfilled." into sc-dev am: 792a32cb am: 85eaea94

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

Change-Id: I45ad155129670e546b39b56c058b2a0fedb3e202
parents 9285cf57 85eaea94

services/core/java/com/android/server/rotationresolver/RotationResolverManagerPerUserService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -109,7 +109,7 @@ final class RotationResolverManagerPerUserService extends 
        ensureRemoteServiceInitiated();

        ensureRemoteServiceInitiated();





        // Cancel the previous on-going request.

        // Cancel the previous on-going request.

        if (mCurrentRequest != null) {

        if (mCurrentRequest != null && !mCurrentRequest.mIsFulfilled) {

            cancelLocked();

            cancelLocked();

        }

        }