Merge "[RCS] Add initial RcsFeature type" am: 6cb5422c5b

am: ca6995b7bc

Change-Id: Ic0a07c251380fe5dcbc0053d2d67d327ad28be46
This commit is contained in:
Allen Su
2019-11-19 17:56:46 -08:00
committed by android-build-merger

View File

@@ -199,11 +199,18 @@ public class RcsFeature extends ImsFeature {
/** @hide*/ /** @hide*/
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = "CAPABILITY_TYPE_", flag = true, value = { @IntDef(prefix = "CAPABILITY_TYPE_", flag = true, value = {
CAPABILITY_TYPE_NONE,
CAPABILITY_TYPE_OPTIONS_UCE, CAPABILITY_TYPE_OPTIONS_UCE,
CAPABILITY_TYPE_PRESENCE_UCE CAPABILITY_TYPE_PRESENCE_UCE
}) })
public @interface RcsImsCapabilityFlag {} public @interface RcsImsCapabilityFlag {}
/**
* Undefined capability type for initialization
* @hide
*/
public static final int CAPABILITY_TYPE_NONE = 0;
/** /**
* This carrier supports User Capability Exchange using SIP OPTIONS as defined by the * This carrier supports User Capability Exchange using SIP OPTIONS as defined by the
* framework. If set, the RcsFeature should support capability exchange using SIP OPTIONS. * framework. If set, the RcsFeature should support capability exchange using SIP OPTIONS.