diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-10-15 19:59:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-15 19:59:19 +0000 |
| commit | 9e18d7ab70eb581200afe0abbd1bb6e32f9e135d (patch) | |
| tree | 59590a4faf3c2af9e949b7ac29e2971e9b102973 /telecomm/java/android | |
| parent | 4ef72f85e0b5a8b9efac301577106afa4a8fd17a (diff) | |
| parent | 2ec53ebbc662282628a9f3ab7352caa320f7d522 (diff) | |
| download | frameworks_base-9e18d7ab70eb581200afe0abbd1bb6e32f9e135d.zip frameworks_base-9e18d7ab70eb581200afe0abbd1bb6e32f9e135d.tar.gz frameworks_base-9e18d7ab70eb581200afe0abbd1bb6e32f9e135d.tar.bz2 | |
Merge "Remove unused onConferenceWith method" into lmp-mr1-dev
Diffstat (limited to 'telecomm/java/android')
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 2227a04..51f193f 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -1009,16 +1009,6 @@ public abstract class Connection { */ public void onPostDialContinue(boolean proceed) {} - /** - * Merge this connection and the specified connection into a conference call. Once the - * connections are merged, the calls should be added to the an existing or new - * {@code Conference} instance. For new {@code Conference} instances, use - * {@code ConnectionService#addConference}. - * - * @param otherConnection The connection with which this connection should be conferenced. - */ - public void onConferenceWith(Connection otherConnection) {} - static String toLogSafePhoneNumber(String number) { // For unknown number, log empty string. if (number == null) { |