Merge "A few fixes for RotationResolver" into sc-dev

2 files changed, 4 insertions, 6 deletions

diff --git a/core/java/android/service/rotationresolver/RotationResolutionRequest.java b/core/java/android/service/rotationresolver/RotationResolutionRequest.java
index 94a6052c246d..8e76e2fc9202 100644
--- a/core/java/android/service/rotationresolver/RotationResolutionRequest.java
+++ b/core/java/android/service/rotationresolver/RotationResolutionRequest.java
@@ -20,6 +20,7 @@ import android.annotation.NonNull;
 import android.annotation.SystemApi;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.view.Surface;
 
 /**
  * This class represents a request to an {@link RotationResolverService}. The request contains
@@ -54,7 +55,7 @@ public final class RotationResolutionRequest implements Parcelable {
         mTimeoutMillis = timeoutMillis;
     }
 
-    public int getProposedRotation() {
+    @Surface.Rotation public int getProposedRotation() {
         return mProposedRotation;
     }
 
diff --git a/core/java/android/service/rotationresolver/RotationResolverService.java b/core/java/android/service/rotationresolver/RotationResolverService.java
index 593a642b4a38..604dd0ac8298 100644
--- a/core/java/android/service/rotationresolver/RotationResolverService.java
+++ b/core/java/android/service/rotationresolver/RotationResolverService.java
@@ -146,11 +146,8 @@ public abstract class RotationResolverService extends Service {
         }
         mPendingCallback = new RotationResolverCallbackWrapper(callback, this);
         mCancellationSignal = CancellationSignal.fromTransport(transport);
-        try {
-            onResolveRotation(request, mCancellationSignal, mPendingCallback);
-        } catch (UnsupportedOperationException e) {
-            reportFailures(callback, ROTATION_RESULT_FAILURE_CANCELLED);
-        }
+
+        onResolveRotation(request, mCancellationSignal, mPendingCallback);
     }
 
     @MainThread