Merge "Remove the hidden API "onRemoteCapabilityRequest" from the exposed interface CapabilityExchangeEventListener"

telephony/java/android/telephony/ims/stub/CapabilityExchangeEventListener.java

@@ -18,15 +18,12 @@ package android.telephony.ims.stub;
 
 import android.annotation.NonNull;
 import android.annotation.SystemApi;
-import android.net.Uri;
 import android.telephony.ims.ImsException;
 import android.telephony.ims.RcsContactUceCapability;
 import android.telephony.ims.RcsUceAdapter;
 import android.telephony.ims.feature.ImsFeature;
 import android.telephony.ims.feature.RcsFeature;
 
-import java.util.List;
-
 /**
  * The interface of the capabilities event listener for ImsService to notify the framework of the
  * UCE request and status updated.
@@ -84,25 +81,4 @@ public interface CapabilityExchangeEventListener {
      * Telephony stack has crashed.
      */
     void onUnpublish() throws ImsException;
-
-    /**
-     * Inform the framework of a query for this device's UCE capabilities.
-     * <p>
-     * The framework will respond via the
-     * {@link OptionsRequestCallback#onRespondToCapabilityRequest} or
-     * {@link OptionsRequestCallback#onRespondToCapabilityRequestWithError}
-     * @param contactUri The URI associated with the remote contact that is
-     * requesting capabilities.
-     * @param remoteCapabilities The remote contact's capability information.
-     * @param callback The callback of this request which is sent from the remote user.
-     * @throws ImsException If this {@link RcsCapabilityExchangeImplBase} instance is not
-     * currently connected to the framework. This can happen if the {@link RcsFeature} is not
-     * {@link ImsFeature#STATE_READY} and the {@link RcsFeature} has not received
-     * the {@link ImsFeature#onFeatureReady()} callback. This may also happen in rare
-     * cases when the Telephony stack has crashed.
-     * @hide
-     */
-    void onRemoteCapabilityRequest(@NonNull Uri contactUri,
-            @NonNull List<String> remoteCapabilities,
-            @NonNull OptionsRequestCallback callback) throws ImsException;
 }