Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f9c50d5 authored by James Lin's avatar James Lin Committed by Automerger Merge Worker
Browse files

Merge "Update the UCE OPTIONS API" am: a2d03f9e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8f417912930dd3b5087f2f9b3d9ee081cbdac6a
parents ce049176 a2d03f9e

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -12295,7 +12295,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);















  }







































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



+2
−21




























Original line number
Diff line number
Diff line








@@ -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