From 337cf182210db2c7dd31ad5fb6e3194f8b2a6a90 Mon Sep 17 00:00:00 2001
From: Yi Jiang <eejiang@google.com>
Date: Mon, 8 Mar 2021 12:25:01 -0800
Subject: [PATCH] Adds debugging logs in Rotation Resolver.

Test: manual.
Bug: 182004426
Change-Id: Ie567ba5d0de20d23ef70f454a33e77659dd8fc47
---
 .../rotationresolver/RemoteRotationResolverService.java    | 6 +++++-
 .../RotationResolverManagerPerUserService.java             | 7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/rotationresolver/RemoteRotationResolverService.java b/services/core/java/com/android/server/rotationresolver/RemoteRotationResolverService.java
index b995b19c58419..cfb4c27820fa7 100644
--- a/services/core/java/com/android/server/rotationresolver/RemoteRotationResolverService.java
+++ b/services/core/java/com/android/server/rotationresolver/RemoteRotationResolverService.java
@@ -87,6 +87,7 @@ class RemoteRotationResolverService extends ServiceConnector.Impl<IRotationResol
             synchronized (request.mLock) {
                 if (!request.mIsFulfilled) {
                     request.mCallbackInternal.onFailure(ROTATION_RESULT_FAILURE_TIMED_OUT);
+                    Slog.d(TAG, "Trying to cancel the remote request. Reason: Timed out.");
                     request.cancelInternal();
                 }
             }
@@ -139,7 +140,6 @@ class RemoteRotationResolverService extends ServiceConnector.Impl<IRotationResol
         void cancelInternal() {
             synchronized (mLock) {
                 if (mIsFulfilled) {
-                    Slog.v(TAG, "Trying to cancel the request that has been already fulfilled.");
                     return;
                 }
                 mIsFulfilled = true;
@@ -187,6 +187,8 @@ class RemoteRotationResolverService extends ServiceConnector.Impl<IRotationResol
                             SystemClock.elapsedRealtime() - request.mRequestStartTimeMillis;
                     logRotationStats(request.mProposedRotation, request.mCurrentRotation, rotation,
                             timeToCalculate);
+                    Slog.d(TAG, "onSuccess:" + rotation);
+                    Slog.d(TAG, "timeToCalculate:" + timeToCalculate);
                 }
             }
 
@@ -204,6 +206,8 @@ class RemoteRotationResolverService extends ServiceConnector.Impl<IRotationResol
                             SystemClock.elapsedRealtime() - request.mRequestStartTimeMillis;
                     logRotationStats(request.mProposedRotation, request.mCurrentRotation,
                             RESOLUTION_FAILURE, timeToCalculate);
+                    Slog.d(TAG, "onFailure:" + error);
+                    Slog.d(TAG, "timeToCalculate:" + timeToCalculate);
                 }
             }
 
diff --git a/services/core/java/com/android/server/rotationresolver/RotationResolverManagerPerUserService.java b/services/core/java/com/android/server/rotationresolver/RotationResolverManagerPerUserService.java
index 0cd0458c6b2b2..13f8d61f74f53 100644
--- a/services/core/java/com/android/server/rotationresolver/RotationResolverManagerPerUserService.java
+++ b/services/core/java/com/android/server/rotationresolver/RotationResolverManagerPerUserService.java
@@ -82,6 +82,7 @@ final class RotationResolverManagerPerUserService extends
         if (mCurrentRequest == null) {
             return;
         }
+        Slog.d(TAG, "Trying to cancel the remote request. Reason: Service destroyed.");
         cancelLocked();
 
         if (mRemoteService != null) {
@@ -118,8 +119,10 @@ final class RotationResolverManagerPerUserService extends
 
         cancellationSignalInternal.setOnCancelListener(() -> {
             synchronized (mLock) {
-                Slog.i(TAG, "Trying to cancel current request.");
-                mCurrentRequest.cancelInternal();
+                if (mCurrentRequest != null && !mCurrentRequest.mIsFulfilled) {
+                    Slog.d(TAG, "Trying to cancel the remote request. Reason: Client cancelled.");
+                    mCurrentRequest.cancelInternal();
+                }
             }
         });