From 15847070b55589cb95fee954edbcb203cc7aadcf Mon Sep 17 00:00:00 2001 From: Brad Ebinger Date: Wed, 18 May 2016 11:08:36 -0700 Subject: [PATCH] Adds CDMA Voice Privacy Property to Call Adds the CDMA Enhanced Voice Privacy Property to a Call when it has been enabled for the call by the network. Bug: 26931679 Change-Id: I1f5b4a4fb22fe6aaaf0c424ef11925c6058c6e82 --- api/current.txt | 2 ++ api/system-current.txt | 2 ++ api/test-current.txt | 2 ++ telecomm/java/android/telecom/Call.java | 8 ++++++++ telecomm/java/android/telecom/Connection.java | 10 +++++++++- 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index 559c2ff9e6b85..10ec9a6c9e6a2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -36136,6 +36136,7 @@ package android.telecom { field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4 field public static final int PROPERTY_ENTERPRISE_CALL = 32; // 0x20 field public static final int PROPERTY_GENERIC_CONFERENCE = 2; // 0x2 + field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 128; // 0x80 field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10 field public static final int PROPERTY_IS_EXTERNAL_CALL = 64; // 0x40 field public static final int PROPERTY_WIFI = 8; // 0x8 @@ -36322,6 +36323,7 @@ package android.telecom { field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT"; field public static final java.lang.String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS"; field public static final java.lang.String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER"; + field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 32; // 0x20 field public static final int PROPERTY_IS_EXTERNAL_CALL = 16; // 0x10 field public static final int STATE_ACTIVE = 4; // 0x4 field public static final int STATE_DIALING = 3; // 0x3 diff --git a/api/system-current.txt b/api/system-current.txt index 360eabc2f74f6..981e9630c588d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -38972,6 +38972,7 @@ package android.telecom { field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4 field public static final int PROPERTY_ENTERPRISE_CALL = 32; // 0x20 field public static final int PROPERTY_GENERIC_CONFERENCE = 2; // 0x2 + field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 128; // 0x80 field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10 field public static final int PROPERTY_IS_EXTERNAL_CALL = 64; // 0x40 field public static final int PROPERTY_WIFI = 8; // 0x8 @@ -39169,6 +39170,7 @@ package android.telecom { field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT"; field public static final java.lang.String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS"; field public static final java.lang.String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER"; + field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 32; // 0x20 field public static final int PROPERTY_IS_EXTERNAL_CALL = 16; // 0x10 field public static final int STATE_ACTIVE = 4; // 0x4 field public static final int STATE_DIALING = 3; // 0x3 diff --git a/api/test-current.txt b/api/test-current.txt index 72da2b40468bb..23233b1766747 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -36214,6 +36214,7 @@ package android.telecom { field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4 field public static final int PROPERTY_ENTERPRISE_CALL = 32; // 0x20 field public static final int PROPERTY_GENERIC_CONFERENCE = 2; // 0x2 + field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 128; // 0x80 field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10 field public static final int PROPERTY_IS_EXTERNAL_CALL = 64; // 0x40 field public static final int PROPERTY_WIFI = 8; // 0x8 @@ -36400,6 +36401,7 @@ package android.telecom { field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT"; field public static final java.lang.String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS"; field public static final java.lang.String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER"; + field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 32; // 0x20 field public static final int PROPERTY_IS_EXTERNAL_CALL = 16; // 0x10 field public static final int STATE_ACTIVE = 4; // 0x4 field public static final int STATE_DIALING = 3; // 0x3 diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index 1ccacc24f0582..3a6d1fd19b133 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -307,6 +307,11 @@ public final class Call { */ public static final int PROPERTY_IS_EXTERNAL_CALL = 0x00000040; + /** + * Indicates that the call has CDMA Enhanced Voice Privacy enabled. + */ + public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 0x00000080; + //****************************************************************************************** // Next PROPERTY value: 0x00000100 //****************************************************************************************** @@ -463,6 +468,9 @@ public final class Call { if (hasProperty(properties, PROPERTY_IS_EXTERNAL_CALL)) { builder.append(" PROPERTY_IS_EXTERNAL_CALL"); } + if(hasProperty(properties, PROPERTY_HAS_CDMA_VOICE_PRIVACY)) { + builder.append(" PROPERTY_HAS_CDMA_VOICE_PRIVACY"); + } builder.append("]"); return builder.toString(); } diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index a5e3c4612a5d5..3316bc8a9176b 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -334,9 +334,13 @@ public abstract class Connection extends Conferenceable { */ public static final int PROPERTY_IS_EXTERNAL_CALL = 1<<4; + /** + * Indicates that the connection has CDMA Enhanced Voice Privacy enabled. + */ + public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 1<<5; //********************************************************************************************** - // Next PROPERTY value: 1<<5 + // Next PROPERTY value: 1<<6 //********************************************************************************************** /** @@ -531,6 +535,10 @@ public abstract class Connection extends Conferenceable { builder.append(" PROPERTY_IS_EXTERNAL_CALL"); } + if (can(properties, PROPERTY_HAS_CDMA_VOICE_PRIVACY)) { + builder.append(" PROPERTY_HAS_CDMA_VOICE_PRIVACY"); + } + builder.append("]"); return builder.toString(); }