From fca2a5555f41ef31b55dcf23e27c32347621f0f3 Mon Sep 17 00:00:00 2001
From: Yi Jiang <eejiang@google.com>
Date: Mon, 28 Jun 2021 14:34:41 -0700
Subject: [PATCH] Don't cancel the previous request if it's fulfilled.

In Rotation Resolver Manager, we incorrectly send addtional 'cancelled'
results to WOL. This change fixes that issue.

Bug: 191792497
Test: maually tested the feature.

Change-Id: I5de023d7cc5b8429d11d7037afa9d32a21f55762
---
 .../rotationresolver/RotationResolverManagerPerUserService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/rotationresolver/RotationResolverManagerPerUserService.java b/services/core/java/com/android/server/rotationresolver/RotationResolverManagerPerUserService.java
index ccf096ee55292..165a1d6174295 100644
--- 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();
         }