Merge commit '7f61051' into merge2 (94f2c27a) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -30219,6 +30219,7 @@ package android.telecom {
	method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle();		method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle();
	method public android.telecom.Connection getPrimaryConnection();		method public android.telecom.Connection getPrimaryConnection();
	method public final int getState();		method public final int getState();
			method public final android.telecom.StatusHints getStatusHints();
	method public void onAudioStateChanged(android.telecom.AudioState);		method public void onAudioStateChanged(android.telecom.AudioState);
	method public void onConnectionAdded(android.telecom.Connection);		method public void onConnectionAdded(android.telecom.Connection);
	method public void onDisconnect();		method public void onDisconnect();
	@@ -30237,6 +30238,7 @@ package android.telecom {
	method public final void setConnectionCapabilities(int);		method public final void setConnectionCapabilities(int);
	method public final void setDisconnected(android.telecom.DisconnectCause);		method public final void setDisconnected(android.telecom.DisconnectCause);
	method public final void setOnHold();		method public final void setOnHold();
			method public final void setStatusHints(android.telecom.StatusHints);
	field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L		field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L
	}		}

api/system-current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -32330,6 +32330,7 @@ package android.telecom {
	method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle();		method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle();
	method public android.telecom.Connection getPrimaryConnection();		method public android.telecom.Connection getPrimaryConnection();
	method public final int getState();		method public final int getState();
			method public final android.telecom.StatusHints getStatusHints();
	method public void onAudioStateChanged(android.telecom.AudioState);		method public void onAudioStateChanged(android.telecom.AudioState);
	method public void onConnectionAdded(android.telecom.Connection);		method public void onConnectionAdded(android.telecom.Connection);
	method public void onDisconnect();		method public void onDisconnect();
	@@ -32348,6 +32349,7 @@ package android.telecom {
	method public final void setConnectionCapabilities(int);		method public final void setConnectionCapabilities(int);
	method public final void setDisconnected(android.telecom.DisconnectCause);		method public final void setDisconnected(android.telecom.DisconnectCause);
	method public final void setOnHold();		method public final void setOnHold();
			method public final void setStatusHints(android.telecom.StatusHints);
	field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L		field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L
	}		}

telecomm/java/android/telecom/Conference.java

+21 −0

Original line number	Original line	Diff line number	Diff line
	@@ -50,6 +50,7 @@ public abstract class Conference implements Conferenceable {
	Conference conference, int connectionCapabilities) {}		Conference conference, int connectionCapabilities) {}
	public void onVideoStateChanged(Conference c, int videoState) { }		public void onVideoStateChanged(Conference c, int videoState) { }
	public void onVideoProviderChanged(Conference c, Connection.VideoProvider videoProvider) {}		public void onVideoProviderChanged(Conference c, Connection.VideoProvider videoProvider) {}
			public void onStatusHintsChanged(Conference conference, StatusHints statusHints) {}
	}		}

	private final Set<Listener> mListeners = new CopyOnWriteArraySet<>();		private final Set<Listener> mListeners = new CopyOnWriteArraySet<>();
	@@ -67,6 +68,7 @@ public abstract class Conference implements Conferenceable {
	private int mConnectionCapabilities;		private int mConnectionCapabilities;
	private String mDisconnectMessage;		private String mDisconnectMessage;
	private long mConnectTimeMillis = CONNECT_TIME_NOT_SPECIFIED;		private long mConnectTimeMillis = CONNECT_TIME_NOT_SPECIFIED;
			private StatusHints mStatusHints;

	private final Connection.Listener mConnectionDeathListener = new Connection.Listener() {		private final Connection.Listener mConnectionDeathListener = new Connection.Listener() {
	@Override		@Override
	@@ -535,4 +537,23 @@ public abstract class Conference implements Conferenceable {
	getVideoProvider(),		getVideoProvider(),
	super.toString());		super.toString());
	}		}

			/**
			* Sets the label and icon status to display in the InCall UI.
			*
			* @param statusHints The status label and icon to set.
			*/
			public final void setStatusHints(StatusHints statusHints) {
			mStatusHints = statusHints;
			for (Listener l : mListeners) {
			l.onStatusHintsChanged(this, statusHints);
			}
			}

			/**
			* @return The status hints for this conference.
			*/
			public final StatusHints getStatusHints() {
			return mStatusHints;
			}
	}		}

telecomm/java/android/telecom/ConnectionService.java

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -427,6 +427,12 @@ public abstract class ConnectionService extends Service {
	videoProvider);		videoProvider);
	mAdapter.setVideoProvider(id, videoProvider);		mAdapter.setVideoProvider(id, videoProvider);
	}		}

			@Override
			public void onStatusHintsChanged(Conference conference, StatusHints statusHints) {
			String id = mIdByConference.get(conference);
			mAdapter.setStatusHints(id, statusHints);
			}
	};		};

	private final Connection.Listener mConnectionListener = new Connection.Listener() {		private final Connection.Listener mConnectionListener = new Connection.Listener() {
	@@ -903,8 +909,9 @@ public abstract class ConnectionService extends Service {
	conference.getVideoProvider() == null ?		conference.getVideoProvider() == null ?
	null : conference.getVideoProvider().getInterface(),		null : conference.getVideoProvider().getInterface(),
	conference.getVideoState(),		conference.getVideoState(),
	conference.getConnectTimeMillis()		conference.getConnectTimeMillis(),
	);		conference.getStatusHints());

	mAdapter.addConferenceCall(id, parcelableConference);		mAdapter.addConferenceCall(id, parcelableConference);
	mAdapter.setVideoProvider(id, conference.getVideoProvider());		mAdapter.setVideoProvider(id, conference.getVideoProvider());
	mAdapter.setVideoState(id, conference.getVideoState());		mAdapter.setVideoState(id, conference.getVideoState());

telecomm/java/android/telecom/ParcelableConference.java

+13 −14

Original line number	Original line	Diff line number	Diff line
	@@ -34,9 +34,10 @@ public final class ParcelableConference implements Parcelable {
	private int mState;		private int mState;
	private int mConnectionCapabilities;		private int mConnectionCapabilities;
	private List<String> mConnectionIds;		private List<String> mConnectionIds;
	private long mConnectTimeMillis;		private long mConnectTimeMillis = Conference.CONNECT_TIME_NOT_SPECIFIED;
	private final IVideoProvider mVideoProvider;		private final IVideoProvider mVideoProvider;
	private final int mVideoState;		private final int mVideoState;
			private StatusHints mStatusHints;

	public ParcelableConference(		public ParcelableConference(
	PhoneAccountHandle phoneAccount,		PhoneAccountHandle phoneAccount,
	@@ -44,7 +45,9 @@ public final class ParcelableConference implements Parcelable {
	int connectionCapabilities,		int connectionCapabilities,
	List<String> connectionIds,		List<String> connectionIds,
	IVideoProvider videoProvider,		IVideoProvider videoProvider,
	int videoState) {		int videoState,
			long connectTimeMillis,
			StatusHints statusHints) {
	mPhoneAccount = phoneAccount;		mPhoneAccount = phoneAccount;
	mState = state;		mState = state;
	mConnectionCapabilities = connectionCapabilities;		mConnectionCapabilities = connectionCapabilities;
	@@ -52,18 +55,8 @@ public final class ParcelableConference implements Parcelable {
	mConnectTimeMillis = Conference.CONNECT_TIME_NOT_SPECIFIED;		mConnectTimeMillis = Conference.CONNECT_TIME_NOT_SPECIFIED;
	mVideoProvider = videoProvider;		mVideoProvider = videoProvider;
	mVideoState = videoState;		mVideoState = videoState;
	}

	public ParcelableConference(
	PhoneAccountHandle phoneAccount,
	int state,
	int connectionCapabilities,
	List<String> connectionIds,
	IVideoProvider videoProvider,
	int videoState,
	long connectTimeMillis) {
	this(phoneAccount, state, connectionCapabilities, connectionIds, videoProvider, videoState);
	mConnectTimeMillis = connectTimeMillis;		mConnectTimeMillis = connectTimeMillis;
			mStatusHints = statusHints;
	}		}

	@Override		@Override
	@@ -113,6 +106,10 @@ public final class ParcelableConference implements Parcelable {
	return mVideoState;		return mVideoState;
	}		}

			public StatusHints getStatusHints() {
			return mStatusHints;
			}

	public static final Parcelable.Creator<ParcelableConference> CREATOR =		public static final Parcelable.Creator<ParcelableConference> CREATOR =
	new Parcelable.Creator<ParcelableConference> () {		new Parcelable.Creator<ParcelableConference> () {
	@Override		@Override
	@@ -124,13 +121,14 @@ public final class ParcelableConference implements Parcelable {
	List<String> connectionIds = new ArrayList<>(2);		List<String> connectionIds = new ArrayList<>(2);
	source.readList(connectionIds, classLoader);		source.readList(connectionIds, classLoader);
	long connectTimeMillis = source.readLong();		long connectTimeMillis = source.readLong();
			StatusHints statusHints = source.readParcelable(classLoader);

	IVideoProvider videoCallProvider =		IVideoProvider videoCallProvider =
	IVideoProvider.Stub.asInterface(source.readStrongBinder());		IVideoProvider.Stub.asInterface(source.readStrongBinder());
	int videoState = source.readInt();		int videoState = source.readInt();

	return new ParcelableConference(phoneAccount, state, capabilities, connectionIds,		return new ParcelableConference(phoneAccount, state, capabilities, connectionIds,
	videoCallProvider, videoState, connectTimeMillis);		videoCallProvider, videoState, connectTimeMillis, statusHints);
	}		}

	@Override		@Override
	@@ -156,5 +154,6 @@ public final class ParcelableConference implements Parcelable {
	destination.writeStrongBinder(		destination.writeStrongBinder(
	mVideoProvider != null ? mVideoProvider.asBinder() : null);		mVideoProvider != null ? mVideoProvider.asBinder() : null);
	destination.writeInt(mVideoState);		destination.writeInt(mVideoState);
			destination.writeParcelable(mStatusHints, 0);
	}		}
	}		}