Merge \"Adds CDMA Voice Privacy Property to Call\" into nyc-mr1-dev (8f6b7a8c) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -36144,6 +36144,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
		@@ -36330,6 +36331,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

+2 −0

Original line number	Diff line number	Diff line
		@@ -38980,6 +38980,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
		@@ -39177,6 +39178,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

+2 −0

Original line number	Diff line number	Diff line
		@@ -36222,6 +36222,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
		@@ -36408,6 +36409,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

+8 −0

Original line number	Diff line number	Diff line
		@@ -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();
		}

+9 −1

Original line number	Diff line number	Diff line
		@@ -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();
		}