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

2021-06-30 18:59:23 +00:00
parent ebf77ebc51 fca2a5555f
commit 792a32cbc7
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/rotationresolver/RotationResolverManagerPerUserService.java
+++ b/services/core/java/com/android/server/rotationresolver/RotationResolverManagerPerUserService.java
@@ -109,7 +109,7 @@ final class RotationResolverManagerPerUserService extends
        ensureRemoteServiceInitiated();

        // Cancel the previous on-going request.
-        if (mCurrentRequest != null) {
+        if (mCurrentRequest != null && !mCurrentRequest.mIsFulfilled) {
            cancelLocked();
        }