Merge "Introduce new In-Call Service interface" into lmp-dev (4ad58a47) · Commits · e / os / android_frameworks_base

api/current.txt

+88 −23

Original line number	Diff line number	Diff line
		@@ -27851,6 +27851,62 @@ package android.system {

		package android.telecomm {

		public final class Call {
		method public void addListener(android.telecomm.Call.Listener);
		method public void answer();
		method public void conference();
		method public void disconnect();
		method public android.telecomm.RemoteCallVideoProvider getCallVideoProvider();
		method public java.util.List<java.lang.String> getCannedTextResponses();
		method public java.util.List<android.telecomm.Call> getChildren();
		method public android.telecomm.Call.Details getDetails();
		method public android.telecomm.Call getParent();
		method public java.lang.String getRemainingPostDialSequence();
		method public int getState();
		method public void hold();
		method public void phoneAccountClicked();
		method public void playDtmfTone(char);
		method public void postDialContinue(boolean);
		method public void reject(boolean, java.lang.String);
		method public void removeListener(android.telecomm.Call.Listener);
		method public void splitFromConference();
		method public void stopDtmfTone();
		method public void swapWithBackgroundCall();
		method public void unhold();
		field public static final int STATE_ACTIVE = 4; // 0x4
		field public static final int STATE_DIALING = 1; // 0x1
		field public static final int STATE_DISCONNECTED = 7; // 0x7
		field public static final int STATE_HOLDING = 3; // 0x3
		field public static final int STATE_NEW = 0; // 0x0
		field public static final int STATE_RINGING = 2; // 0x2
		}

		public static class Call.Details {
		method public android.telecomm.PhoneAccount getAccount();
		method public java.lang.String getCallerDisplayName();
		method public int getCallerDisplayNamePresentation();
		method public int getCapabilities();
		method public long getConnectTimeMillis();
		method public int getDisconnectCauseCode();
		method public java.lang.String getDisconnectCauseMsg();
		method public android.telecomm.GatewayInfo getGatewayInfo();
		method public android.net.Uri getHandle();
		method public int getHandlePresentation();
		}

		public static abstract class Call.Listener {
		ctor public Call.Listener();
		method public void onCallDestroyed(android.telecomm.Call);
		method public void onCallVideoProviderChanged(android.telecomm.Call, android.telecomm.RemoteCallVideoProvider);
		method public void onCannedTextResponsesLoaded(android.telecomm.Call, java.util.List<java.lang.String>);
		method public void onChildrenChanged(android.telecomm.Call, java.util.List<android.telecomm.Call>);
		method public void onDetailsChanged(android.telecomm.Call, android.telecomm.Call.Details);
		method public void onParentChanged(android.telecomm.Call, android.telecomm.Call);
		method public void onPostDial(android.telecomm.Call, java.lang.String);
		method public void onPostDialWait(android.telecomm.Call, java.lang.String);
		method public void onStateChanged(android.telecomm.Call, int);
		}

		public final class CallAudioState implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		@@ -27937,8 +27993,6 @@ package android.telecomm {
		enum_constant public static final android.telecomm.CallState DISCONNECTED;
		enum_constant public static final android.telecomm.CallState NEW;
		enum_constant public static final android.telecomm.CallState ON_HOLD;
		enum_constant public static final android.telecomm.CallState POST_DIAL;
		enum_constant public static final android.telecomm.CallState POST_DIAL_WAIT;
		enum_constant public static final android.telecomm.CallState RINGING;
		}

		@@ -28113,17 +28167,29 @@ package android.telecomm {
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public abstract class InCallService extends android.app.Service {
		public abstract class InCallService {
		ctor protected InCallService();
		method protected abstract void addCall(android.telecomm.InCallCall);
		method protected abstract void bringToForeground(boolean);
		method protected final android.telecomm.InCallAdapter getAdapter();
		method protected void onAdapterAttached(android.telecomm.InCallAdapter);
		method protected abstract void onAudioStateChanged(android.telecomm.CallAudioState);
		method public final android.os.IBinder onBind(android.content.Intent);
		method protected abstract void setPostDial(java.lang.String, java.lang.String);
		method protected abstract void setPostDialWait(java.lang.String, java.lang.String);
		method protected abstract void updateCall(android.telecomm.InCallCall);
		method public final android.os.IBinder getBinder();
		method public android.telecomm.Phone getPhone();
		method public void onPhoneCreated(android.telecomm.Phone);
		method public void onPhoneDestroyed(android.telecomm.Phone);
		}

		public final class Phone {
		method public final void addListener(android.telecomm.Phone.Listener);
		method public final android.telecomm.CallAudioState getAudioState();
		method public final java.util.List<android.telecomm.Call> getCalls();
		method public final void removeListener(android.telecomm.Phone.Listener);
		method public final void setAudioRoute(int);
		method public final void setMuted(boolean);
		}

		public static abstract class Phone.Listener {
		ctor public Phone.Listener();
		method public void onAudioStateChanged(android.telecomm.Phone, android.telecomm.CallAudioState);
		method public void onBringToForeground(android.telecomm.Phone, boolean);
		method public void onCallAdded(android.telecomm.Phone, android.telecomm.Call);
		method public void onCallRemoved(android.telecomm.Phone, android.telecomm.Call);
		}

		public final class PhoneAccount implements android.os.Parcelable {
		@@ -28152,18 +28218,17 @@ package android.telecomm {
		method public void updatePeerDimensions(int, int) throws android.os.RemoteException;
		}

		public class RemoteCallVideoProvider implements android.os.IBinder.DeathRecipient {
		method public void binderDied();
		method public void requestCallDataUsage() throws android.os.RemoteException;
		method public void requestCameraCapabilities() throws android.os.RemoteException;
		method public void sendSessionModifyRequest(android.telecomm.VideoCallProfile) throws android.os.RemoteException;
		method public void sendSessionModifyResponse(android.telecomm.VideoCallProfile) throws android.os.RemoteException;
		method public void setCallVideoClient(android.telecomm.CallVideoClient) throws android.os.RemoteException;
		public class RemoteCallVideoProvider {
		method public void requestCallDataUsage();
		method public void requestCameraCapabilities();
		method public void sendSessionModifyRequest(android.telecomm.VideoCallProfile);
		method public void sendSessionModifyResponse(android.telecomm.VideoCallProfile);
		method public void setCallVideoClient(android.telecomm.CallVideoClient);
		method public void setCamera(java.lang.String) throws android.os.RemoteException;
		method public void setDeviceOrientation(int) throws android.os.RemoteException;
		method public void setDisplaySurface(android.view.Surface) throws android.os.RemoteException;
		method public void setPauseImage(java.lang.String) throws android.os.RemoteException;
		method public void setPreviewSurface(android.view.Surface) throws android.os.RemoteException;
		method public void setDeviceOrientation(int);
		method public void setDisplaySurface(android.view.Surface);
		method public void setPauseImage(java.lang.String);
		method public void setPreviewSurface(android.view.Surface);
		method public void setZoom(float) throws android.os.RemoteException;
		}

telecomm/java/android/telecomm/Call.java

0 → 100644

+710 −0

File added.

Preview size limit exceeded, changes collapsed.

telecomm/java/android/telecomm/CallState.java

+0 −16

Original line number	Diff line number	Diff line
		@@ -47,22 +47,6 @@ public enum CallState {
		*/
		RINGING,

		/**
		* Indicates that the call is active but in a "post-dial" state where Telecomm is now sending
		* some dual-tone multi-frequency signaling (DTMF) tones appended to the dialed number. Normal
		* transitions are to {@link #POST_DIAL_WAIT} when the post-dial string requires user
		* confirmation to proceed, {@link #ACTIVE} when the post-dial tones are completed, or
		* {@link #DISCONNECTED}.
		*/
		POST_DIAL,

		/**
		* Indicates that the call was in the {@link #POST_DIAL} state but is now waiting for user
		* confirmation before the remaining digits can be sent. Normal transitions are to
		* {@link #POST_DIAL} when the user asks Telecomm to proceed with the post-dial sequence.
		*/
		POST_DIAL_WAIT,

		/**
		* Indicates that a call is currently connected to another party and a communication channel is
		* open between them. The normal transition to this state is by the user answering a

telecomm/java/android/telecomm/CallVideoClient.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -241,6 +241,7 @@ public abstract class CallVideoClient {
		*
		* @param callCameraCapabilities The changed camera capabilities.
		*/
		public abstract void onHandleCameraCapabilitiesChange(CallCameraCapabilities callCameraCapabilities);
		public abstract void onHandleCameraCapabilitiesChange(
		CallCameraCapabilities callCameraCapabilities);
		}

telecomm/java/android/telecomm/InCallAdapter.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ import com.android.internal.telecomm.IInCallAdapter;
		* Receives commands from {@link InCallService} implementations which should be executed by
		* Telecomm. When Telecomm binds to a {@link InCallService}, an instance of this class is given to
		* the in-call service through which it can manipulate live (active, dialing, ringing) calls. When
		* the in-call service is notified of new calls ({@link InCallService#addCall}), it can use the
		* the in-call service is notified of new calls, it can use the
		* given call IDs to execute commands such as {@link #answerCall} for incoming calls or
		* {@link #disconnectCall} for active calls the user would like to end. Some commands are only
		* appropriate for calls in certain states; please consult each method for such limitations.
		@@ -167,16 +167,15 @@ public final class InCallAdapter {
		* A post-dial DTMF string is a string of digits entered after a phone number, when dialed,
		* that are immediately sent as DTMF tones to the recipient as soon as the connection is made.
		* While these tones are playing, Telecomm will notify the {@link InCallService} that the call
		* is in the {@link InCallService#setPostDial(String,String)} state.
		* is in the post dial state.
		*
		* If the DTMF string contains a {@link TelecommConstants#DTMF_CHARACTER_PAUSE} symbol, Telecomm
		* will temporarily pause playing the tones for a pre-defined period of time.
		*
		* If the DTMF string contains a {@link TelecommConstants#DTMF_CHARACTER_WAIT} symbol, Telecomm
		* will pause playing the tones and notify the {@link InCallService} that the call is in the
		* {@link InCallService#setPostDialWait(String,String)} state. When the user decides to continue
		* the postdial sequence, the {@link InCallService} should invoke the
		* {@link #postDialContinue(String,boolean)} method.
		* post dial wait state. When the user decides to continue the postdial sequence, the
		* {@link InCallService} should invoke the {@link #postDialContinue(String,boolean)} method.
		*
		* @param callId The unique ID of the call for which postdial string playing should continue.
		* @param proceed Whether or not to continue with the post-dial sequence.