resolve merge conflicts of bcb17eb to m-wireless-dev. (d11a3156) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/Call.java

+15 −2

Original line number	Diff line number	Diff line
		@@ -217,7 +217,17 @@ public final class Call {
		*
		* @hide
		*/
		public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00008000;
		public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00020000;

		/**
		* Speed up audio setup for MT call.
		* @hide
		*/
		public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00040000;

		//******************************************************************************************
		// Next CAPABILITY value: 0x00080000
		//******************************************************************************************

		private final Uri mHandle;
		private final int mHandlePresentation;
		@@ -316,6 +326,9 @@ public final class Call {
		if (can(capabilities, CAPABILITY_SHOW_CALLBACK_NUMBER)) {
		builder.append(" CAPABILITY_SHOW_CALLBACK_NUMBER");
		}
		if (can(capabilities, CAPABILITY_SPEED_UP_MT_AUDIO)) {
		builder.append(" CAPABILITY_SPEED_UP_MT_AUDIO");
		}
		builder.append("]");
		return builder.toString();
		}

telecomm/java/android/telecom/Connection.java

+13 −6

Original line number	Diff line number	Diff line
		@@ -171,20 +171,24 @@ public abstract class Connection implements IConferenceable {
		* Connection is using WIFI.
		* @hide
		*/
		public static final int CAPABILITY_WIFI = 0x000010000;

		//**********************************************************************************************
		// Next CAPABILITY value: 0x00020000
		//**********************************************************************************************
		public static final int CAPABILITY_WIFI = 0x00010000;

		/**
		* Indicates that the current device callback number should be shown.
		*
		* @hide
		*/
		public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00008000;
		public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00020000;

		/**
		* Speed up audio setup for MT call.
		* @hide
		*/
		public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00040000;

		//**********************************************************************************************
		// Next CAPABILITY value: 0x00080000
		//**********************************************************************************************

		// Flag controlling whether PII is emitted into the logs
		private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);
		@@ -287,6 +291,9 @@ public abstract class Connection implements IConferenceable {
		if (can(capabilities, CAPABILITY_SHOW_CALLBACK_NUMBER)) {
		builder.append(" CAPABILITY_SHOW_CALLBACK_NUMBER");
		}
		if (can(capabilities, CAPABILITY_SPEED_UP_MT_AUDIO)) {
		builder.append(" CAPABILITY_SPEED_UP_MT_AUDIO");
		}
		builder.append("]");
		return builder.toString();
		}