am 1557a226: Merge "Add functions to update on conference changes." into lmp-mr1-dev (761abc04) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -28114,6 +28114,7 @@ package android.telecom {
		method public void onAbort();
		method public void onAnswer();
		method public void onAudioStateChanged(android.telecom.AudioState);
		method public void onConferenceChanged();
		method public void onDisconnect();
		method public void onHold();
		method public void onPlayDtmfTone(char);

+6 −0

Original line number	Diff line number	Diff line
		@@ -911,6 +911,7 @@ public abstract class Connection {
		mConference = conference;
		if (mConnectionService != null && mConnectionService.containsConference(conference)) {
		fireConferenceChanged();
		onConferenceChanged();
		}
		return true;
		}
		@@ -1009,6 +1010,11 @@ public abstract class Connection {
		*/
		public void onPostDialContinue(boolean proceed) {}

		/**
		* Notifies this Connection that the conference which is set on it has changed.
		*/
		public void onConferenceChanged() {}

		static String toLogSafePhoneNumber(String number) {
		// For unknown number, log empty string.
		if (number == null) {

+11 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,17 @@ public final class PhoneCapabilities {
		return (capabilities & capability) != 0;
		}

		/**
		* Removes the specified capability from the set of capabilities and returns the new set.
		* @param capabilities The set of capabilities.
		* @param capability The capability to remove from the set.
		* @return The set of capabilities, with the capability removed.
		* @hide
		*/
		public static int remove(int capabilities, int capability) {
		return capabilities & ~capability;
		}

		public static String toString(int capabilities) {
		StringBuilder builder = new StringBuilder();
		builder.append("[Capabilities:");