From 12b5644a43063c28b45b0100b3629975047f3b05 Mon Sep 17 00:00:00 2001
From: "James.cf Lin" <jamescflin@google.com>
Date: Wed, 24 Feb 2021 15:20:44 +0800
Subject: [PATCH] Update the UCE OPTIONS API

Change the UCE OPTIONS api from
"OptionsRequestCallback#onRespondToCapabilityRequest(RcsContactUceCapability caps)"
to
"OptionsRequestCallback#onRespondToCapabilityRequest(RcsContactUceCapability caps, boolean isBlocked)"

Bug: 180619695
Test: atest -c CtsTelephonyTestCases:android.telephony.ims.cts.RcsUceAdapterTest
Change-Id: I7ef0bc7142079b4bf2645f09ca710a13530a10c0
---
 core/api/system-current.txt                   |  2 +-
 .../stub/CapabilityExchangeEventListener.java | 23 ++-----------------
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 4e7fc292f3214..6eb3d18dd203c 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -12290,7 +12290,7 @@ package android.telephony.ims.stub {
   }
 
   public static interface CapabilityExchangeEventListener.OptionsRequestCallback {
-    method public default void onRespondToCapabilityRequest(@NonNull android.telephony.ims.RcsContactUceCapability, boolean);
+    method public void onRespondToCapabilityRequest(@NonNull android.telephony.ims.RcsContactUceCapability, boolean);
     method public void onRespondToCapabilityRequestWithError(@IntRange(from=100, to=699) int, @NonNull String);
   }
 
diff --git a/telephony/java/android/telephony/ims/stub/CapabilityExchangeEventListener.java b/telephony/java/android/telephony/ims/stub/CapabilityExchangeEventListener.java
index 4967e5da7c9a7..62955487897ff 100644
--- a/telephony/java/android/telephony/ims/stub/CapabilityExchangeEventListener.java
+++ b/telephony/java/android/telephony/ims/stub/CapabilityExchangeEventListener.java
@@ -25,7 +25,6 @@ import android.telephony.ims.RcsContactUceCapability;
 import android.telephony.ims.RcsUceAdapter;
 import android.telephony.ims.feature.ImsFeature;
 import android.telephony.ims.feature.RcsFeature;
-import android.util.Log;
 
 import java.util.List;
 
@@ -40,15 +39,6 @@ public interface CapabilityExchangeEventListener {
      * Interface used by the framework to respond to OPTIONS requests.
      */
     interface OptionsRequestCallback {
-        /**
-         * Respond to a remote capability request from the contact specified with the
-         * capabilities of this device.
-         * @param ownCapabilities The capabilities of this device.
-         * @hide
-         */
-        default void onRespondToCapabilityRequest(
-                @NonNull RcsContactUceCapability ownCapabilities) {}
-
         /**
          * Respond to a remote capability request from the contact specified with the
          * capabilities of this device.
@@ -57,17 +47,8 @@ public interface CapabilityExchangeEventListener {
          *         capabilities of this device. If true, the device should respond to the OPTIONS
          *         request with a 200 OK response and no capabilities.
          */
-        default void onRespondToCapabilityRequest(@NonNull RcsContactUceCapability ownCapabilities,
-                boolean isBlocked) {
-            Log.w("CapabilityExchangeEventListener", "implement "
-                    + "onRespondToCapabilityRequest(RcsContactUceCapability, boolean) instead!");
-            // Fall back to old implementation
-            if (isBlocked) {
-                onRespondToCapabilityRequestWithError(200, "OK");
-            } else {
-                onRespondToCapabilityRequest(ownCapabilities);
-            }
-        }
+        void onRespondToCapabilityRequest(@NonNull RcsContactUceCapability ownCapabilities,
+                boolean isBlocked);
 
         /**
          * Respond to a remote capability request from the contact specified with the