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

Commit 12b5644a authored by James.cf Lin's avatar James.cf Lin
Browse files

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
parent 6faddabe

core/api/system-current.txt

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















  }







































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