diff options
author | Santos Cordon <santoscordon@google.com> | 2014-08-07 18:44:13 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-07 18:44:13 +0000 |
commit | 2bfcc7a05cce27cb563eda86eebac5e3e89268c0 (patch) | |
tree | 161eb1fc8cb086fd8f98278165762b3096a1d2b4 | |
parent | 70833478dda89032f0d1c24a05b05e18d86ea7c5 (diff) | |
parent | 8abea424907159dcb0c8d551ccc0bbbec83df806 (diff) | |
download | frameworks_base-2bfcc7a05cce27cb563eda86eebac5e3e89268c0.zip frameworks_base-2bfcc7a05cce27cb563eda86eebac5e3e89268c0.tar.gz frameworks_base-2bfcc7a05cce27cb563eda86eebac5e3e89268c0.tar.bz2 |
am b24368ea: Remove ldaps from AOSP code.
* commit 'b24368eabc7def55a534f9cb9bb78c346a3ec3fd':
Remove ldaps from AOSP code.
5 files changed, 7 insertions, 11 deletions
diff --git a/telecomm/java/android/telecomm/Call.java b/telecomm/java/android/telecomm/Call.java index 4e9e604..3374d51 100644 --- a/telecomm/java/android/telecomm/Call.java +++ b/telecomm/java/android/telecomm/Call.java @@ -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); diff --git a/telecomm/java/android/telecomm/Connection.java b/telecomm/java/android/telecomm/Connection.java index d347aad..b323646 100644 --- a/telecomm/java/android/telecomm/Connection.java +++ b/telecomm/java/android/telecomm/Connection.java @@ -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) {} diff --git a/telecomm/java/android/telecomm/ConnectionService.java b/telecomm/java/android/telecomm/ConnectionService.java index fddc9b0..5e6bf87 100644 --- a/telecomm/java/android/telecomm/ConnectionService.java +++ b/telecomm/java/android/telecomm/ConnectionService.java @@ -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) { diff --git a/telecomm/java/android/telecomm/InCallAdapter.java b/telecomm/java/android/telecomm/InCallAdapter.java index 279e47d..08eb03a 100644 --- a/telecomm/java/android/telecomm/InCallAdapter.java +++ b/telecomm/java/android/telecomm/InCallAdapter.java @@ -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. diff --git a/telecomm/java/android/telecomm/InCallService.java b/telecomm/java/android/telecomm/InCallService.java index 83e2957..a88e1cc 100644 --- a/telecomm/java/android/telecomm/InCallService.java +++ b/telecomm/java/android/telecomm/InCallService.java @@ -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; |