Merge "DO NOT MERGE ANYWHERE" into cw-e-dev (085796bd) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/Call.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -253,6 +253,7 @@ public final class Call {
		private final PhoneAccountHandle mAccountHandle;
		private final int mCallCapabilities;
		private final int mCallProperties;
		private final int mSupportedAudioRoutes;
		private final DisconnectCause mDisconnectCause;
		private final long mConnectTimeMillis;
		private final GatewayInfo mGatewayInfo;
		@@ -447,6 +448,15 @@ public final class Call {
		return mCallProperties;
		}

		/**
		* @return a bitmask of the audio routes available for the call.
		*
		* @hide
		*/
		public int getSupportedAudioRoutes() {
		return mSupportedAudioRoutes;
		}

		/**
		* @return For a {@link #STATE_DISCONNECTED} {@code Call}, the disconnect cause expressed
		* by {@link android.telecom.DisconnectCause}.
		@@ -513,6 +523,7 @@ public final class Call {
		Objects.equals(mAccountHandle, d.mAccountHandle) &&
		Objects.equals(mCallCapabilities, d.mCallCapabilities) &&
		Objects.equals(mCallProperties, d.mCallProperties) &&
		Objects.equals(mSupportedAudioRoutes, d.mSupportedAudioRoutes) &&
		Objects.equals(mDisconnectCause, d.mDisconnectCause) &&
		Objects.equals(mConnectTimeMillis, d.mConnectTimeMillis) &&
		Objects.equals(mGatewayInfo, d.mGatewayInfo) &&
		@@ -534,6 +545,7 @@ public final class Call {
		Objects.hashCode(mAccountHandle) +
		Objects.hashCode(mCallCapabilities) +
		Objects.hashCode(mCallProperties) +
		Objects.hashCode(mSupportedAudioRoutes) +
		Objects.hashCode(mDisconnectCause) +
		Objects.hashCode(mConnectTimeMillis) +
		Objects.hashCode(mGatewayInfo) +
		@@ -552,6 +564,7 @@ public final class Call {
		PhoneAccountHandle accountHandle,
		int capabilities,
		int properties,
		int audioRoutes,
		DisconnectCause disconnectCause,
		long connectTimeMillis,
		GatewayInfo gatewayInfo,
		@@ -566,6 +579,7 @@ public final class Call {
		mAccountHandle = accountHandle;
		mCallCapabilities = capabilities;
		mCallProperties = properties;
		mSupportedAudioRoutes = audioRoutes;
		mDisconnectCause = disconnectCause;
		mConnectTimeMillis = connectTimeMillis;
		mGatewayInfo = gatewayInfo;
		@@ -1008,6 +1022,7 @@ public final class Call {
		parcelableCall.getAccountHandle(),
		parcelableCall.getCapabilities(),
		parcelableCall.getProperties(),
		parcelableCall.getSupportedAudioRoutes(),
		parcelableCall.getDisconnectCause(),
		parcelableCall.getConnectTimeMillis(),
		parcelableCall.getGatewayInfo(),

telecomm/java/android/telecom/CallAudioState.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -44,8 +44,12 @@ public final class CallAudioState implements Parcelable {
		*/
		public static final int ROUTE_WIRED_OR_EARPIECE = ROUTE_EARPIECE \| ROUTE_WIRED_HEADSET;

		/** Bit mask of all possible audio routes. */
		private static final int ROUTE_ALL = ROUTE_EARPIECE \| ROUTE_BLUETOOTH \| ROUTE_WIRED_HEADSET \|
		/**
		* Bit mask of all possible audio routes.
		*
		* @hide
		**/
		public static final int ROUTE_ALL = ROUTE_EARPIECE \| ROUTE_BLUETOOTH \| ROUTE_WIRED_HEADSET \|
		ROUTE_SPEAKER;

		private final boolean isMuted;

telecomm/java/android/telecom/Connection.java

+27 −0

Original line number	Diff line number	Diff line
		@@ -416,6 +416,7 @@ public abstract class Connection extends Conferenceable {
		public void onRingbackRequested(Connection c, boolean ringback) {}
		public void onDestroyed(Connection c) {}
		public void onConnectionCapabilitiesChanged(Connection c, int capabilities) {}
		public void onSupportedAudioRoutesChanged(Connection c, int supportedAudioRoutes) {}
		public void onVideoProviderChanged(
		Connection c, VideoProvider videoProvider) {}
		public void onAudioModeIsVoipChanged(Connection c, boolean isVoip) {}
		@@ -1082,6 +1083,7 @@ public abstract class Connection extends Conferenceable {
		private int mCallerDisplayNamePresentation;
		private boolean mRingbackRequested = false;
		private int mConnectionCapabilities;
		private int mSupportedAudioRoutes = CallAudioState.ROUTE_ALL;
		private VideoProvider mVideoProvider;
		private boolean mAudioModeIsVoip;
		private long mConnectTimeMillis = Conference.CONNECT_TIME_NOT_SPECIFIED;
		@@ -1305,6 +1307,15 @@ public abstract class Connection extends Conferenceable {
		return mConnectionCapabilities;
		}

		/**
		* Returns the connection's supported audio routes.
		*
		* @hide
		*/
		public final int getSupportedAudioRoutes() {
		return mSupportedAudioRoutes;
		}

		/**
		* Sets the value of the {@link #getAddress()} property.
		*
		@@ -1501,6 +1512,22 @@ public abstract class Connection extends Conferenceable {
		}
		}

		/**
		* Sets the supported audio routes.
		*
		* @param supportedAudioRoutes the supported audio routes as a bitmask.
		* See {@link CallAudioState}
		* @hide
		*/
		public final void setSupportedAudioRoutes(int supportedAudioRoutes) {
		if (mSupportedAudioRoutes != supportedAudioRoutes) {
		mSupportedAudioRoutes = supportedAudioRoutes;
		for (Listener l : mListeners) {
		l.onSupportedAudioRoutesChanged(this, mSupportedAudioRoutes);
		}
		}
		}

		/**
		* Tears down the Connection object.
		*/

telecomm/java/android/telecom/ConnectionService.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -669,6 +669,7 @@ public abstract class ConnectionService extends Service {
		request.getAccountHandle(),
		connection.getState(),
		connection.getConnectionCapabilities(),
		connection.getSupportedAudioRoutes(),
		connection.getAddress(),
		connection.getAddressPresentation(),
		connection.getCallerDisplayName(),
		@@ -1011,6 +1012,7 @@ public abstract class ConnectionService extends Service {
		phoneAccountHandle,
		connection.getState(),
		connection.getConnectionCapabilities(),
		connection.getSupportedAudioRoutes(),
		connection.getAddress(),
		connection.getAddressPresentation(),
		connection.getCallerDisplayName(),

telecomm/java/android/telecom/ParcelableCall.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ public final class ParcelableCall implements Parcelable {
		private final List<String> mCannedSmsResponses;
		private final int mCapabilities;
		private final int mProperties;
		private final int mSupportedAudioRoutes;
		private final long mConnectTimeMillis;
		private final Uri mHandle;
		private final int mHandlePresentation;
		@@ -64,6 +65,7 @@ public final class ParcelableCall implements Parcelable {
		List<String> cannedSmsResponses,
		int capabilities,
		int properties,
		int supportedAudioRoutes,
		long connectTimeMillis,
		Uri handle,
		int handlePresentation,
		@@ -86,6 +88,7 @@ public final class ParcelableCall implements Parcelable {
		mCannedSmsResponses = cannedSmsResponses;
		mCapabilities = capabilities;
		mProperties = properties;
		mSupportedAudioRoutes = supportedAudioRoutes;
		mConnectTimeMillis = connectTimeMillis;
		mHandle = handle;
		mHandlePresentation = handlePresentation;
		@@ -137,6 +140,11 @@ public final class ParcelableCall implements Parcelable {
		/** Bitmask of properties of the call. */
		public int getProperties() { return mProperties; }

		/** Bitmask of supported routes of the call */
		public int getSupportedAudioRoutes() {
		return mSupportedAudioRoutes;
		}

		/** The time that the call switched to the active state. */
		public long getConnectTimeMillis() {
		return mConnectTimeMillis;
		@@ -291,6 +299,7 @@ public final class ParcelableCall implements Parcelable {
		source.readList(conferenceableCallIds, classLoader);
		Bundle intentExtras = source.readBundle(classLoader);
		Bundle extras = source.readBundle(classLoader);
		int supportedAudioRoutes = source.readInt();
		return new ParcelableCall(
		id,
		state,
		@@ -298,6 +307,7 @@ public final class ParcelableCall implements Parcelable {
		cannedSmsResponses,
		capabilities,
		properties,
		supportedAudioRoutes,
		connectTimeMillis,
		handle,
		handlePresentation,
		@@ -354,6 +364,7 @@ public final class ParcelableCall implements Parcelable {
		destination.writeList(mConferenceableCallIds);
		destination.writeBundle(mIntentExtras);
		destination.writeBundle(mExtras);
		destination.writeInt(mSupportedAudioRoutes);
		}

		@Override