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

Merge "Add UCE Call Composer + enriched calling tags" am: feaed68912 am: 8e637e628f am: cedaa4b578

Browse Source 
Change-Id: I83fed5453b5033ea2cc2e9d15b7a9614b2718cab
This commit is contained in:
Automerger Merge Worker
2020-01-17 22:30:57 +00:00
parent a29bd81987 cedaa4b578
commit 39e2fdf7b6
2 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/system-current.txt
View File

@@ -11760,6 +11760,9 @@ package android.telephony.ims {
method public boolean isCapable(int);
method public boolean isCapable(@NonNull String);
method public void writeToParcel(@NonNull android.os.Parcel, int);
field public static final int CAPABILITY_CALL_COMPOSER = 4194304; // 0x400000
field public static final int CAPABILITY_CHAT_BOT = 67108864; // 0x4000000
field public static final int CAPABILITY_CHAT_BOT_ROLE = 134217728; // 0x8000000
field public static final int CAPABILITY_CHAT_SESSION = 2; // 0x2
field public static final int CAPABILITY_CHAT_SESSION_STORE_FORWARD = 4; // 0x4
field public static final int CAPABILITY_CHAT_STANDALONE = 1; // 0x1
@@ -11776,9 +11779,13 @@ package android.telephony.ims {
field public static final int CAPABILITY_IMAGE_SHARE = 256; // 0x100
field public static final int CAPABILITY_IP_VIDEO_CALL = 16384; // 0x4000
field public static final int CAPABILITY_IP_VOICE_CALL = 8192; // 0x2000
field public static final int CAPABILITY_PLUG_IN = 268435456; // 0x10000000
field public static final int CAPABILITY_POST_CALL = 8388608; // 0x800000
field public static final int CAPABILITY_RCS_VIDEO_CALL = 1048576; // 0x100000
field public static final int CAPABILITY_RCS_VIDEO_ONLY_CALL = 2097152; // 0x200000
field public static final int CAPABILITY_RCS_VOICE_CALL = 524288; // 0x80000
field public static final int CAPABILITY_SHARED_MAP = 16777216; // 0x1000000
field public static final int CAPABILITY_SHARED_SKETCH = 33554432; // 0x2000000
field public static final int CAPABILITY_SOCIAL_PRESENCE = 2048; // 0x800
field public static final int CAPABILITY_VIDEO_SHARE = 1024; // 0x400
field public static final int CAPABILITY_VIDEO_SHARE_DURING_CS_CALL = 512; // 0x200

32
telephony/java/android/telephony/ims/RcsContactUceCapability.java
View File

@@ -83,8 +83,23 @@ public final class RcsContactUceCapability implements Parcelable {
public static final int CAPABILITY_RCS_VOICE_CALL = (1 << 19);
/** Supports RCS video calling */
public static final int CAPABILITY_RCS_VIDEO_CALL = (1 << 20);
/** Supports RCS video calling, where video media can not be dropped */
/** Supports RCS video calling, where video media can not be dropped. */
public static final int CAPABILITY_RCS_VIDEO_ONLY_CALL = (1 << 21);
/** Supports call composer, where outgoing calls can be enriched with pre-call content.*/
public static final int CAPABILITY_CALL_COMPOSER = (1 << 22);
/** Supports post call information that is included in the call if the call is missed.*/
public static final int CAPABILITY_POST_CALL = (1 << 23);
/** Supports sharing a map where the user can draw, share markers, and share their position. */
public static final int CAPABILITY_SHARED_MAP = (1 << 24);
/** Supports sharing a canvas, where users can draw, add images, and change background colors.*/
public static final int CAPABILITY_SHARED_SKETCH = (1 << 25);
/** Supports communication with Chatbots. */
public static final int CAPABILITY_CHAT_BOT = (1 << 26);
/** Supports Chatbot roles. */
public static final int CAPABILITY_CHAT_BOT_ROLE = (1 << 27);
/** Supports the unidirectional plug-ins framework. */
public static final int CAPABILITY_PLUG_IN = (1 << 28);
/** @hide*/
@Retention(RetentionPolicy.SOURCE)
@@ -110,7 +125,14 @@ public final class RcsContactUceCapability implements Parcelable {
CAPABILITY_GEOLOCATION_PULL_FILE_TRANSFER,
CAPABILITY_RCS_VOICE_CALL,
CAPABILITY_RCS_VIDEO_CALL,
CAPABILITY_RCS_VIDEO_ONLY_CALL
CAPABILITY_RCS_VIDEO_ONLY_CALL,
CAPABILITY_CALL_COMPOSER,
CAPABILITY_POST_CALL,
CAPABILITY_SHARED_MAP,
CAPABILITY_SHARED_SKETCH,
CAPABILITY_CHAT_BOT,
CAPABILITY_CHAT_BOT_ROLE,
CAPABILITY_PLUG_IN
})
public @interface CapabilityFlag {}
@@ -183,7 +205,7 @@ public final class RcsContactUceCapability implements Parcelable {
}
private final Uri mContactUri;
private int mCapabilities;
private long mCapabilities;
private List<String> mExtensionTags = new ArrayList<>();
private Map<Integer, Uri> mServiceMap = new HashMap<>();
@@ -198,7 +220,7 @@ public final class RcsContactUceCapability implements Parcelable {
private RcsContactUceCapability(Parcel in) {
mContactUri = in.readParcelable(Uri.class.getClassLoader());
mCapabilities = in.readInt();
mCapabilities = in.readLong();
in.readStringList(mExtensionTags);
// read mServiceMap as key,value pair
int mapSize = in.readInt();
@@ -223,7 +245,7 @@ public final class RcsContactUceCapability implements Parcelable {
@Override
public void writeToParcel(@NonNull Parcel out, int flags) {
out.writeParcelable(mContactUri, 0);
out.writeInt(mCapabilities);
out.writeLong(mCapabilities);
out.writeStringList(mExtensionTags);
// write mServiceMap as key,value pairs
int mapSize = mServiceMap.keySet().size();