resolve merge conflicts of edc625f to m-wireless-dev. (0f51da32) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −0

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

telecomm/java/android/telecom/Conference.java

+21 −0

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

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

		private final Connection.Listener mConnectionDeathListener = new Connection.Listener() {
		@Override
		@@ -535,4 +537,23 @@ public abstract class Conference implements IConferenceable {
		getVideoProvider(),
		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

+8 −1

Original line number	Diff line number	Diff line
		@@ -427,6 +427,12 @@ public abstract class ConnectionService extends Service {
		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() {
		@@ -912,7 +918,8 @@ public abstract class ConnectionService extends Service {
		null : conference.getVideoProvider().getInterface(),
		conference.getVideoState(),
		conference.getConnectTimeMillis()
		);
		conference.getStatusHints());

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

telecomm/java/android/telecom/ParcelableConference.java

+13 −14

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

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

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

		public StatusHints getStatusHints() {
		return mStatusHints;
		}

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

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

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

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