summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android/telecom/Conference.java
diff options
context:
space:
mode:
authorSantos Cordon <santoscordon@google.com>2015-05-12 14:19:24 -0700
committerSantos Cordon <santoscordon@google.com>2015-05-12 14:19:24 -0700
commit4055d648993c35be19487f7ab82e337197e25297 (patch)
tree5ea29d436f65733e8e45927d0c14d81bbff22767 /telecomm/java/android/telecom/Conference.java
parent5d2e4f20fee033a22fbadffb291c4e47f35b7633 (diff)
downloadframeworks_base-4055d648993c35be19487f7ab82e337197e25297.zip
frameworks_base-4055d648993c35be19487f7ab82e337197e25297.tar.gz
frameworks_base-4055d648993c35be19487f7ab82e337197e25297.tar.bz2
Fix build break.
Change-Id: Icca3603d3f4a38146fb9bc04a384a22ece4014f4
Diffstat (limited to 'telecomm/java/android/telecom/Conference.java')
-rw-r--r--telecomm/java/android/telecom/Conference.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java
index 89967d6..e2971f9 100644
--- a/telecomm/java/android/telecom/Conference.java
+++ b/telecomm/java/android/telecom/Conference.java
@@ -462,7 +462,7 @@ public abstract class Conference implements Conferenceable {
* @hide
*/
@SystemApi
- public final Connection getPrimaryConnection() {
+ public Connection getPrimaryConnection() {
if (mUnmodifiableChildConnections == null || mUnmodifiableChildConnections.isEmpty()) {
return null;
}