Merge "Propagate remote conference property to Dialer" into main (1386f941) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -44143,6 +44143,7 @@ package android.telecom {
		field public static final int PROPERTY_IS_EXTERNAL_CALL = 64; // 0x40
		field @FlaggedApi("com.android.server.telecom.flags.voip_app_actions_support") public static final int PROPERTY_IS_TRANSACTIONAL = 32768; // 0x8000
		field public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 2048; // 0x800
		field @FlaggedApi("com.android.server.telecom.flags.remotely_hosted_property") public static final int PROPERTY_REMOTELY_HOSTED = 65536; // 0x10000
		field public static final int PROPERTY_RTT = 1024; // 0x400
		field public static final int PROPERTY_SELF_MANAGED = 256; // 0x100
		field public static final int PROPERTY_VOIP_AUDIO_MODE = 4096; // 0x1000

+15 −1

Original line number	Diff line number	Diff line
		@@ -691,8 +691,19 @@ public final class Call {
		@FlaggedApi(Flags.FLAG_VOIP_APP_ACTIONS_SUPPORT)
		public static final int PROPERTY_IS_TRANSACTIONAL = 0x00008000;

		/**
		* Set by the framework to indicate that a {@link Conference} or {@link Connection} is
		* hosted on device other than the current one. Used in scenarios where the conference
		* originator is the remote device and the current device is a participant of that
		* conference.
		* <p>
		* This property is specific to IMS conference calls originating in Telephony.
		*/
		@FlaggedApi(Flags.FLAG_REMOTELY_HOSTED_PROPERTY)
		public static final int PROPERTY_REMOTELY_HOSTED = 0x00010000;

		//******************************************************************************************
		// Next PROPERTY value: 0x00010000
		// Next PROPERTY value: 0x00020000
		//******************************************************************************************

		private final @CallState int mState;
		@@ -894,6 +905,9 @@ public final class Call {
		if (hasProperty(properties, PROPERTY_IS_TRANSACTIONAL)) {
		builder.append(" PROPERTY_IS_TRANSACTIONAL");
		}
		if (hasProperty(properties, PROPERTY_REMOTELY_HOSTED)) {
		builder.append(" PROPERTY_REMOTELY_HOSTED");
		}
		builder.append("]");
		return builder.toString();
		}