Remove ldaps from AOSP code. (8abea424) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecomm/Call.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -249,7 +249,7 @@ public final class Call {
		/**
		* Invoked when the state of this {@code Call} has changed. See {@link #getState()}.
		*
		* TODO(ihab): Provide previous state also?
		* TODO: Provide previous state also?
		*
		* @param call The {@code Call} invoking this method.
		* @param state The new state of the {@code Call}.
		@@ -453,7 +453,7 @@ public final class Call {
		/**
		* Notifies this {@code Call} that the phone account user interface element was touched.
		*
		* TODO(ihab): Figure out if and how we can generalize this
		* TODO: Figure out if and how we can generalize this
		*/
		public void phoneAccountClicked() {
		mInCallAdapter.phoneAccountClicked(mTelecommCallId);

+3 −3

Original line number	Diff line number	Diff line
		@@ -273,7 +273,7 @@ public abstract class Connection {
		}

		/**
		* TODO(santoscordon): Needs documentation.
		* TODO: Needs documentation.
		*/
		public final void setParentConnection(Connection parentConnection) {
		Log.d(this, "parenting %s to %s", this, parentConnection);
		@@ -458,7 +458,7 @@ public abstract class Connection {
		}

		/**
		* TODO(santoscordon): Needs documentation.
		* TODO: Needs documentation.
		*/
		public final void setPostDialWait(String remaining) {
		for (Listener l : mListeners) {
		@@ -654,7 +654,7 @@ public abstract class Connection {
		public void onSwapWithBackgroundCall() {}

		/**
		* TODO(santoscordon): Needs documentation.
		* TODO: Needs documentation.
		*/
		public void onChildrenChanged(List<Connection> children) {}

+1 −1

Original line number	Diff line number	Diff line
		@@ -647,7 +647,7 @@ public abstract class ConnectionService extends Service {
		return;
		}

		// TODO(santoscordon): Find existing conference call and invoke split(connection).
		// TODO: Find existing conference call and invoke split(connection).
		}

		private void swapWithBackgroundCall(String callId) {

+0 −4

Original line number	Diff line number	Diff line
		@@ -28,8 +28,6 @@ import com.android.internal.telecomm.IInCallAdapter;
		* given call IDs to execute commands such as {@link #answerCall} for incoming calls or
		* {@link #disconnectCall} for active calls the user would like to end. Some commands are only
		* appropriate for calls in certain states; please consult each method for such limitations.
		* TODO(santoscordon): Needs more/better comments once the API is finalized.
		* TODO(santoscordon): Specify the adapter will stop functioning when there are no more calls.
		*/
		public final class InCallAdapter {
		private final IInCallAdapter mAdapter;
		@@ -56,8 +54,6 @@ public final class InCallAdapter {

		/**
		* Instructs Telecomm to reject the specified call.
		* TODO(santoscordon): Add reject-with-text-message parameter when that feature
		* is ported over.
		*
		* @param callId The identifier of the call to reject.
		* @param rejectWithMessage Whether to reject with a text message.

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ import java.lang.String;
		* This service is implemented by any app that wishes to provide the user-interface for managing
		* phone calls. Telecomm binds to this service while there exists a live (active or incoming) call,
		* and uses it to notify the in-call app of any live and and recently disconnected calls.
		* TODO(santoscordon): What happens if two or more apps on a given device implement this interface?
		* TODO: What happens if two or more apps on a given device implement this interface?
		*/
		public abstract class InCallService extends Service {
		private static final int MSG_SET_IN_CALL_ADAPTER = 1;