Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update the UCE OPTIONS API" am: a2d03f9eec am: 2f9c50d50a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d6c55e59a39875e4cc8213c0dd950113d522414
This commit is contained in:
James Lin
2021-02-26 10:07:03 +00:00
committed by Automerger Merge Worker
parent 4d942da6f9 2f9c50d50a
commit ee8b27d293
2 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -12295,7 +12295,7 @@ package android.telephony.ims.stub {
} }
public static interface CapabilityExchangeEventListener.OptionsRequestCallback { 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); method public void onRespondToCapabilityRequestWithError(@IntRange(from=100, to=699) int, @NonNull String);
} }

23
telephony/java/android/telephony/ims/stub/CapabilityExchangeEventListener.java
View File

@@ -25,7 +25,6 @@ import android.telephony.ims.RcsContactUceCapability;
import android.telephony.ims.RcsUceAdapter; import android.telephony.ims.RcsUceAdapter;
import android.telephony.ims.feature.ImsFeature; import android.telephony.ims.feature.ImsFeature;
import android.telephony.ims.feature.RcsFeature; import android.telephony.ims.feature.RcsFeature;
import android.util.Log;
import java.util.List; import java.util.List;
@@ -40,15 +39,6 @@ public interface CapabilityExchangeEventListener {
* Interface used by the framework to respond to OPTIONS requests. * Interface used by the framework to respond to OPTIONS requests.
*/ */
interface OptionsRequestCallback { 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 * Respond to a remote capability request from the contact specified with the
* capabilities of this device. * capabilities of this device.
@@ -57,17 +47,8 @@ public interface CapabilityExchangeEventListener {
* capabilities of this device. If true, the device should respond to the OPTIONS * capabilities of this device. If true, the device should respond to the OPTIONS
* request with a 200 OK response and no capabilities. * request with a 200 OK response and no capabilities.
*/ */
default void onRespondToCapabilityRequest(@NonNull RcsContactUceCapability ownCapabilities, void onRespondToCapabilityRequest(@NonNull RcsContactUceCapability ownCapabilities,
boolean isBlocked) { boolean isBlocked);
Log.w("CapabilityExchangeEventListener", "implement "
+ "onRespondToCapabilityRequest(RcsContactUceCapability, boolean) instead!");
// Fall back to old implementation
if (isBlocked) {
onRespondToCapabilityRequestWithError(200, "OK");
} else {
onRespondToCapabilityRequest(ownCapabilities);
}
}
/** /**
* Respond to a remote capability request from the contact specified with the * Respond to a remote capability request from the contact specified with the