Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8c0ddcd authored May 20, 2016 by Tony Mak Committed by android-build-merger May 20, 2016

Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

am: 53b5df43

* commit '53b5df43':
  Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Change-Id: I92a8e1e1452ecc80d422c0905a4b86089d24e80b

parents 14466eff 53b5df43

api/current.txt

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36005,10 +36005,11 @@ package android.telecom {
	field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8		field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8
	field public static final int PROPERTY_CONFERENCE = 1; // 0x1		field public static final int PROPERTY_CONFERENCE = 1; // 0x1
	field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4		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_GENERIC_CONFERENCE = 2; // 0x2
	field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10		field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10
	field public static final int PROPERTY_WIFI = 8; // 0x8		field public static final int PROPERTY_WIFI = 8; // 0x8
	field public static final int PROPERTY_WORK_CALL = 32; // 0x20		field public static final deprecated int PROPERTY_WORK_CALL = 32; // 0x20
	}		}

	public final class CallAudioState implements android.os.Parcelable {		public final class CallAudioState implements android.os.Parcelable {

api/system-current.txt

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -38841,10 +38841,11 @@ package android.telecom {
	field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8		field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8
	field public static final int PROPERTY_CONFERENCE = 1; // 0x1		field public static final int PROPERTY_CONFERENCE = 1; // 0x1
	field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4		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_GENERIC_CONFERENCE = 2; // 0x2
	field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10		field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10
	field public static final int PROPERTY_WIFI = 8; // 0x8		field public static final int PROPERTY_WIFI = 8; // 0x8
	field public static final int PROPERTY_WORK_CALL = 32; // 0x20		field public static final deprecated int PROPERTY_WORK_CALL = 32; // 0x20
	}		}

	public static abstract deprecated class Call.Listener extends android.telecom.Call.Callback {		public static abstract deprecated class Call.Listener extends android.telecom.Call.Callback {

api/test-current.txt

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36082,10 +36082,11 @@ package android.telecom {
	field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8		field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8
	field public static final int PROPERTY_CONFERENCE = 1; // 0x1		field public static final int PROPERTY_CONFERENCE = 1; // 0x1
	field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4		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_GENERIC_CONFERENCE = 2; // 0x2
	field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10		field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10
	field public static final int PROPERTY_WIFI = 8; // 0x8		field public static final int PROPERTY_WIFI = 8; // 0x8
	field public static final int PROPERTY_WORK_CALL = 32; // 0x20		field public static final deprecated int PROPERTY_WORK_CALL = 32; // 0x20
	}		}

	public final class CallAudioState implements android.os.Parcelable {		public final class CallAudioState implements android.os.Parcelable {

docs/html/preview/features/afw.jd

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -515,7 +515,7 @@ Android N.</p>

	<p>		<p>
	The dialer should check for the new flag		The dialer should check for the new flag
	<code>android.telecom.Call.PROPERTY_WORK_CALL</code> to determine if a call		<code>android.telecom.Call.PROPERTY_ENTERPRISE_CALL</code> to determine if a call
	is a work call. If a call is a work call, the dialer should indicate this,		is a work call. If a call is a work call, the dialer should indicate this,
	such as by adding a work badge.		such as by adding a work badge.
	</p>		</p>

telecomm/java/android/telecom/Call.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -287,10 +287,15 @@ public final class Call {
	public static final int PROPERTY_HIGH_DEF_AUDIO = 0x00000010;		public static final int PROPERTY_HIGH_DEF_AUDIO = 0x00000010;

	/**		/**
	* Whether the call is associated with the work profile.		* @deprecated Use {@link #PROPERTY_ENTERPRISE_CALL} instead.
	*/		*/
	public static final int PROPERTY_WORK_CALL = 0x00000020;		public static final int PROPERTY_WORK_CALL = 0x00000020;

			/**
			* Whether the call is associated with the work profile.
			*/
			public static final int PROPERTY_ENTERPRISE_CALL = 0x00000020;

	/**		/**
	* When set, indicates that this {@code Call} does not actually exist locally for the		* When set, indicates that this {@code Call} does not actually exist locally for the
	* {@link ConnectionService}.		* {@link ConnectionService}.