commit cac65febb7bf50f0bc03d897ebbafa8347c0de31
author Yorke Lee <yorkelee@google.com> Thu Aug 06 01:43:05 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 06 01:43:05 2015 +0000
tree b61a961ae2911d768a9c7fd039c7e42bcdd506a3
parent c34288be586028f949686e9a4fe7b84207bf2a6d
parent f0affc6d46849e844bec9ddc755ffae0042e443f

am f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev

* commit 'f0affc6d46849e844bec9ddc755ffae0042e443f':
  Correctly hide setConnectionService

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index e16294e..05e494b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30091,7 +30091,6 @@
     method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
     method public final void setConferenceables(java.util.List<android.telecom.Conferenceable>);
     method public final void setConnectionCapabilities(int);
-    method public final void setConnectionService(android.telecom.ConnectionService);
     method public final void setDialing();
     method public final void setDisconnected(android.telecom.DisconnectCause);
     method public final void setExtras(android.os.Bundle);

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index a784378..d9702ac 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -32276,7 +32276,6 @@
     method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
     method public final void setConferenceables(java.util.List<android.telecom.Conferenceable>);
     method public final void setConnectionCapabilities(int);
-    method public final void setConnectionService(android.telecom.ConnectionService);
     method public final void setDialing();
     method public final void setDisconnected(android.telecom.DisconnectCause);
     method public final void setExtras(android.os.Bundle);

telecomm/java/android/telecom/Connection.java

diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index d663952..7b277c5 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -1588,7 +1588,7 @@
         return mUnmodifiableConferenceables;
     }
 
-    /*
+    /**
      * @hide
      */
     public final void setConnectionService(ConnectionService connectionService) {