Merge "DO NOT MERGE Make Conferenceable an abstract class" into m-wireless-dev (cc88f936) · Commits · e / os / android_frameworks_base

api/current.txt

+7 −7

Original line number	Diff line number	Diff line
		@@ -28426,7 +28426,7 @@ package android.telecom {
		field public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5
		}

		public abstract class Conference implements android.telecom.IConferenceable {
		public abstract class Conference extends android.telecom.Conferenceable {
		ctor public Conference(android.telecom.PhoneAccountHandle);
		method public final boolean addConnection(android.telecom.Connection);
		method public final void destroy();
		@@ -28466,7 +28466,10 @@ package android.telecom {
		field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L
		}

		public abstract class Connection implements android.telecom.IConferenceable {
		public abstract class Conferenceable {
		}

		public abstract class Connection extends android.telecom.Conferenceable {
		ctor public Connection();
		method public static java.lang.String capabilitiesToString(int);
		method public static android.telecom.Connection createCanceledConnection();
		@@ -28479,7 +28482,7 @@ package android.telecom {
		method public final java.lang.String getCallerDisplayName();
		method public final int getCallerDisplayNamePresentation();
		method public final android.telecom.Conference getConference();
		method public final java.util.List<android.telecom.IConferenceable> getConferenceables();
		method public final java.util.List<android.telecom.Conferenceable> getConferenceables();
		method public final int getConnectionCapabilities();
		method public final android.telecom.DisconnectCause getDisconnectCause();
		method public final int getState();
		@@ -28504,7 +28507,7 @@ package android.telecom {
		method public final void setAudioModeIsVoip(boolean);
		method public final void setCallerDisplayName(java.lang.String, int);
		method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
		method public final void setConferenceables(java.util.List<android.telecom.IConferenceable>);
		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();
		@@ -28643,9 +28646,6 @@ package android.telecom {
		field public static final android.os.Parcelable.Creator<android.telecom.GatewayInfo> CREATOR;
		}

		public abstract interface IConferenceable {
		}

		public abstract class InCallService extends android.app.Service {
		ctor public InCallService();
		method public final boolean canAddCall();

api/system-current.txt

+7 −7

Original line number	Diff line number	Diff line
		@@ -30266,7 +30266,7 @@ package android.telecom {
		field public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5
		}

		public abstract class Conference implements android.telecom.IConferenceable {
		public abstract class Conference extends android.telecom.Conferenceable {
		ctor public Conference(android.telecom.PhoneAccountHandle);
		method public final boolean addConnection(android.telecom.Connection);
		method public final void destroy();
		@@ -30308,7 +30308,10 @@ package android.telecom {
		field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L
		}

		public abstract class Connection implements android.telecom.IConferenceable {
		public abstract class Conferenceable {
		}

		public abstract class Connection extends android.telecom.Conferenceable {
		ctor public Connection();
		method public static java.lang.String capabilitiesToString(int);
		method public static android.telecom.Connection createCanceledConnection();
		@@ -30322,7 +30325,7 @@ package android.telecom {
		method public final java.lang.String getCallerDisplayName();
		method public final int getCallerDisplayNamePresentation();
		method public final android.telecom.Conference getConference();
		method public final java.util.List<android.telecom.IConferenceable> getConferenceables();
		method public final java.util.List<android.telecom.Conferenceable> getConferenceables();
		method public final int getConnectionCapabilities();
		method public final android.telecom.DisconnectCause getDisconnectCause();
		method public final int getState();
		@@ -30348,7 +30351,7 @@ package android.telecom {
		method public final void setAudioModeIsVoip(boolean);
		method public final void setCallerDisplayName(java.lang.String, int);
		method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
		method public final void setConferenceables(java.util.List<android.telecom.IConferenceable>);
		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();
		@@ -30487,9 +30490,6 @@ package android.telecom {
		field public static final android.os.Parcelable.Creator<android.telecom.GatewayInfo> CREATOR;
		}

		public abstract interface IConferenceable {
		}

		public abstract class InCallService extends android.app.Service {
		ctor public InCallService();
		method public final boolean canAddCall();

telecomm/java/android/telecom/Conference.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -30,8 +30,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
		/**
		* Represents a conference call which can contain any number of {@link Connection} objects.
		*/
		public abstract class Conference implements IConferenceable {

		public abstract class Conference extends Conferenceable {
		/**
		* Used to indicate that the conference connection time is not specified. If not specified,
		* Telecom will set the connect time.

telecomm/java/android/telecom/IConferenceable.java→telecomm/java/android/telecom/Conferenceable.java

+4 −4

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 The Android Open Source Project
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -19,8 +19,8 @@ package android.telecom;
		/**
		* Interface used to identify entities with which another entity can participate in a conference
		* call with. The {@link ConnectionService} implementation will only recognize
		* {@link IConferenceable}s which are {@link Connection}s or {@link Conference}s.
		* {@link Conferenceable}s which are {@link Connection}s or {@link Conference}s.
		*/
		public interface IConferenceable {

		public abstract class Conferenceable {
		Conferenceable() {}
		}

telecomm/java/android/telecom/Connection.java

+8 −9

Original line number	Diff line number	Diff line
		@@ -47,8 +47,7 @@ import java.util.concurrent.ConcurrentHashMap;
		* must call {@link #destroy()} to signal to the framework that the {@code Connection} is no
		* longer used and associated resources may be recovered.
		*/
		public abstract class Connection implements IConferenceable {

		public abstract class Connection extends Conferenceable {
		public static final int STATE_INITIALIZING = 0;

		public static final int STATE_NEW = 1;
		@@ -327,7 +326,7 @@ public abstract class Connection implements IConferenceable {
		public void onAudioModeIsVoipChanged(Connection c, boolean isVoip) {}
		public void onStatusHintsChanged(Connection c, StatusHints statusHints) {}
		public void onConferenceablesChanged(
		Connection c, List<IConferenceable> conferenceables) {}
		Connection c, List<Conferenceable> conferenceables) {}
		public void onConferenceChanged(Connection c, Conference conference) {}
		/** @hide */
		public void onConferenceParticipantsChanged(Connection c,
		@@ -813,8 +812,8 @@ public abstract class Connection implements IConferenceable {
		*/
		private final Set<Listener> mListeners = Collections.newSetFromMap(
		new ConcurrentHashMap<Listener, Boolean>(8, 0.9f, 1));
		private final List<IConferenceable> mConferenceables = new ArrayList<>();
		private final List<IConferenceable> mUnmodifiableConferenceables =
		private final List<Conferenceable> mConferenceables = new ArrayList<>();
		private final List<Conferenceable> mUnmodifiableConferenceables =
		Collections.unmodifiableList(mConferenceables);

		private int mState = STATE_NEW;
		@@ -1282,9 +1281,9 @@ public abstract class Connection implements IConferenceable {
		*
		* @param conferenceables The conferenceables.
		*/
		public final void setConferenceables(List<IConferenceable> conferenceables) {
		public final void setConferenceables(List<Conferenceable> conferenceables) {
		clearConferenceableList();
		for (IConferenceable c : conferenceables) {
		for (Conferenceable c : conferenceables) {
		// If statement checks for duplicates in input. It makes it N^2 but we're dealing with a
		// small amount of items here.
		if (!mConferenceables.contains(c)) {
		@@ -1304,7 +1303,7 @@ public abstract class Connection implements IConferenceable {
		/**
		* Returns the connections or conferences with which this connection can be conferenced.
		*/
		public final List<IConferenceable> getConferenceables() {
		public final List<Conferenceable> getConferenceables() {
		return mUnmodifiableConferenceables;
		}

		@@ -1579,7 +1578,7 @@ public abstract class Connection implements IConferenceable {
		}

		private final void clearConferenceableList() {
		for (IConferenceable c : mConferenceables) {
		for (Conferenceable c : mConferenceables) {
		if (c instanceof Connection) {
		Connection connection = (Connection) c;
		connection.removeConnectionListener(mConnectionDeathListener);