Merge "Make Telecom/InCallUI APIs public" (cd1bbf29) · Commits · e / os / android_frameworks_base

api/current.txt

+500 −0

File changed.

Preview size limit exceeded, changes collapsed.

api/system-current.txt

+99 −3

Original line number	Diff line number	Diff line
		@@ -28468,6 +28468,7 @@ package android.provider {
		field public static final java.lang.String DEBUG_APP = "debug_app";
		field public static final java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";
		field public static final java.lang.String DEVICE_PROVISIONED = "device_provisioned";
		field public static final java.lang.String HIDE_CARRIER_NETWORK_SETTINGS = "hide_carrier_network_settings";
		field public static final java.lang.String HTTP_PROXY = "http_proxy";
		field public static final deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";
		field public static final java.lang.String MODE_RINGER = "mode_ringer";
		@@ -28634,6 +28635,7 @@ package android.provider {
		field public static final android.net.Uri DEFAULT_RINGTONE_URI;
		field public static final deprecated java.lang.String DEVICE_PROVISIONED = "device_provisioned";
		field public static final deprecated java.lang.String DIM_SCREEN = "dim_screen";
		field public static final java.lang.String DTMF_TONE_TYPE_WHEN_DIALING = "dtmf_tone_type";
		field public static final java.lang.String DTMF_TONE_WHEN_DIALING = "dtmf_tone";
		field public static final java.lang.String END_BUTTON_BEHAVIOR = "end_button_behavior";
		field public static final java.lang.String FONT_SCALE = "font_scale";
		@@ -28682,6 +28684,7 @@ package android.provider {
		field public static final java.lang.String USER_ROTATION = "user_rotation";
		field public static final deprecated java.lang.String USE_GOOGLE_MAIL = "use_google_mail";
		field public static final java.lang.String VIBRATE_ON = "vibrate_on";
		field public static final java.lang.String VIBRATE_WHEN_RINGING = "vibrate_when_ringing";
		field public static final deprecated java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";
		field public static final deprecated java.lang.String WALLPAPER_ACTIVITY = "wallpaper_activity";
		field public static final deprecated java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count";
		@@ -31839,6 +31842,7 @@ package android.telecom {
		public final class AudioState implements android.os.Parcelable {
		ctor public AudioState(boolean, int, int);
		ctor public AudioState(android.telecom.AudioState);
		method public static java.lang.String audioRouteToString(int);
		method public int describeContents();
		method public int getRoute();
		method public int getSupportedRouteMask();
		@@ -31864,6 +31868,7 @@ package android.telecom {
		method public android.telecom.Call getParent();
		method public java.lang.String getRemainingPostDialSequence();
		method public int getState();
		method public android.telecom.InCallService.VideoCall getVideoCall();
		method public void hold();
		method public void mergeConference();
		method public void phoneAccountSelected(android.telecom.PhoneAccountHandle, boolean);
		@@ -31875,6 +31880,7 @@ package android.telecom {
		method public void stopDtmfTone();
		method public void swapConference();
		method public void unhold();
		field public static final java.lang.String AVAILABLE_PHONE_ACCOUNTS = "selectPhoneAccountAccounts";
		field public static final int STATE_ACTIVE = 4; // 0x4
		field public static final int STATE_CONNECTING = 9; // 0x9
		field public static final int STATE_DIALING = 1; // 0x1
		@@ -31887,6 +31893,8 @@ package android.telecom {
		}

		public static class Call.Details {
		method public static boolean can(int, int);
		method public boolean can(int);
		method public static java.lang.String capabilitiesToString(int);
		method public android.telecom.PhoneAccountHandle getAccountHandle();
		method public int getCallCapabilities();
		@@ -31902,14 +31910,24 @@ package android.telecom {
		method public android.telecom.StatusHints getStatusHints();
		method public int getVideoState();
		field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000
		field public static final int CAPABILITY_GENERIC_CONFERENCE = 16384; // 0x4000
		field public static final int CAPABILITY_HIGH_DEF_AUDIO = 32768; // 0x8000
		field public static final int CAPABILITY_HOLD = 1; // 0x1
		field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80
		field public static final int CAPABILITY_MERGE_CONFERENCE = 4; // 0x4
		field public static final int CAPABILITY_MUTE = 64; // 0x40
		field public static final int CAPABILITY_RESPOND_VIA_TEXT = 32; // 0x20
		field public static final int CAPABILITY_SEPARATE_FROM_CONFERENCE = 4096; // 0x1000
		field public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 131072; // 0x20000
		field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = 768; // 0x300
		field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_RX = 256; // 0x100
		field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_TX = 512; // 0x200
		field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL = 3072; // 0xc00
		field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_RX = 1024; // 0x400
		field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_TX = 2048; // 0x800
		field public static final int CAPABILITY_SUPPORT_HOLD = 2; // 0x2
		field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8
		field public static final int CAPABILITY_WIFI = 65536; // 0x10000
		}

		public static abstract class Call.Listener {
		@@ -31922,6 +31940,12 @@ package android.telecom {
		method public void onParentChanged(android.telecom.Call, android.telecom.Call);
		method public void onPostDialWait(android.telecom.Call, java.lang.String);
		method public void onStateChanged(android.telecom.Call, int);
		method public void onVideoCallChanged(android.telecom.Call, android.telecom.InCallService.VideoCall);
		}

		public class CallProperties {
		ctor public CallProperties();
		field public static final int CONFERENCE = 1; // 0x1
		}

		public final class CallState {
		@@ -31938,13 +31962,22 @@ package android.telecom {
		field public static final int RINGING = 4; // 0x4
		}

		public final class CameraCapabilities implements android.os.Parcelable {
		ctor public CameraCapabilities(int, int);
		method public int describeContents();
		method public int getHeight();
		method public int getWidth();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telecom.CameraCapabilities> CREATOR;
		}

		public abstract class Conference implements android.telecom.IConferenceable {
		ctor public Conference(android.telecom.PhoneAccountHandle);
		method public final boolean addConnection(android.telecom.Connection);
		method public final void destroy();
		method public final android.telecom.AudioState getAudioState();
		method public final java.util.List<android.telecom.Connection> getConferenceableConnections();
		method public long getConnectTimeMillis();
		method public final long getConnectTimeMillis();
		method public final int getConnectionCapabilities();
		method public final java.util.List<android.telecom.Connection> getConnections();
		method public final android.telecom.DisconnectCause getDisconnectCause();
		@@ -31990,8 +32023,8 @@ package android.telecom {
		method public final android.telecom.DisconnectCause getDisconnectCause();
		method public final int getState();
		method public final android.telecom.StatusHints getStatusHints();
		method public final android.telecom.Connection.VideoProvider getVideoProvider();
		method public final boolean isRingbackRequested();
		method protected void notifyConferenceStarted();
		method public void onAbort();
		method public void onAnswer();
		method public void onAudioStateChanged(android.telecom.AudioState);
		@@ -32041,6 +32074,38 @@ package android.telecom {
		field public static final int STATE_RINGING = 2; // 0x2
		}

		public static abstract class Connection.VideoProvider {
		ctor public Connection.VideoProvider();
		method public void changeCallDataUsage(long);
		method public void changeCameraCapabilities(android.telecom.CameraCapabilities);
		method public void changePeerDimensions(int, int);
		method public void changeVideoQuality(int);
		method public void handleCallSessionEvent(int);
		method public abstract void onRequestCameraCapabilities();
		method public abstract void onRequestConnectionDataUsage();
		method public abstract void onSendSessionModifyRequest(android.telecom.VideoProfile);
		method public abstract void onSendSessionModifyResponse(android.telecom.VideoProfile);
		method public abstract void onSetCamera(java.lang.String);
		method public abstract void onSetDeviceOrientation(int);
		method public abstract void onSetDisplaySurface(android.view.Surface);
		method public abstract void onSetPauseImage(java.lang.String);
		method public abstract void onSetPreviewSurface(android.view.Surface);
		method public abstract void onSetZoom(float);
		method public void receiveSessionModifyRequest(android.telecom.VideoProfile);
		method public void receiveSessionModifyResponse(int, android.telecom.VideoProfile, android.telecom.VideoProfile);
		field public static final int SESSION_EVENT_CAMERA_FAILURE = 5; // 0x5
		field public static final int SESSION_EVENT_CAMERA_READY = 6; // 0x6
		field public static final int SESSION_EVENT_RX_PAUSE = 1; // 0x1
		field public static final int SESSION_EVENT_RX_RESUME = 2; // 0x2
		field public static final int SESSION_EVENT_TX_START = 3; // 0x3
		field public static final int SESSION_EVENT_TX_STOP = 4; // 0x4
		field public static final int SESSION_MODIFY_REQUEST_FAIL = 2; // 0x2
		field public static final int SESSION_MODIFY_REQUEST_INVALID = 3; // 0x3
		field public static final int SESSION_MODIFY_REQUEST_REJECTED_BY_REMOTE = 5; // 0x5
		field public static final int SESSION_MODIFY_REQUEST_SUCCESS = 1; // 0x1
		field public static final int SESSION_MODIFY_REQUEST_TIMED_OUT = 4; // 0x4
		}

		public final class ConnectionRequest implements android.os.Parcelable {
		ctor public ConnectionRequest(android.telecom.PhoneAccountHandle, android.net.Uri, android.os.Bundle);
		method public int describeContents();
		@@ -32117,6 +32182,32 @@ package android.telecom {
		field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.InCallService";
		}

		public static abstract class InCallService.VideoCall {
		ctor public InCallService.VideoCall();
		method public abstract void requestCallDataUsage();
		method public abstract void requestCameraCapabilities();
		method public abstract void sendSessionModifyRequest(android.telecom.VideoProfile);
		method public abstract void sendSessionModifyResponse(android.telecom.VideoProfile);
		method public abstract void setCamera(java.lang.String);
		method public abstract void setDeviceOrientation(int);
		method public abstract void setDisplaySurface(android.view.Surface);
		method public abstract void setPauseImage(java.lang.String);
		method public abstract void setPreviewSurface(android.view.Surface);
		method public abstract void setVideoCallListener(android.telecom.InCallService.VideoCall.Listener);
		method public abstract void setZoom(float);
		}

		public static abstract class InCallService.VideoCall.Listener {
		ctor public InCallService.VideoCall.Listener();
		method public abstract void onCallDataUsageChanged(long);
		method public abstract void onCallSessionEvent(int);
		method public abstract void onCameraCapabilitiesChanged(android.telecom.CameraCapabilities);
		method public abstract void onPeerDimensionsChanged(int, int);
		method public abstract void onSessionModifyRequestReceived(android.telecom.VideoProfile);
		method public abstract void onSessionModifyResponseReceived(int, android.telecom.VideoProfile, android.telecom.VideoProfile);
		method public abstract void onVideoQualityChanged(int);
		}

		public final class Phone {
		method public final void addListener(android.telecom.Phone.Listener);
		method public final boolean canAddCall();
		@@ -32176,7 +32267,6 @@ package android.telecom {
		ctor public PhoneAccount.Builder(android.telecom.PhoneAccount);
		method public android.telecom.PhoneAccount.Builder addSupportedUriScheme(java.lang.String);
		method public android.telecom.PhoneAccount build();
		method public android.telecom.PhoneAccount.Builder setAccountHandle(android.telecom.PhoneAccountHandle);
		method public android.telecom.PhoneAccount.Builder setAddress(android.net.Uri);
		method public android.telecom.PhoneAccount.Builder setCapabilities(int);
		method public android.telecom.PhoneAccount.Builder setHighlightColor(int);
		@@ -32309,6 +32399,8 @@ package android.telecom {
		method public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsForPackage();
		method public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsSupportingScheme(java.lang.String);
		method public java.util.List<android.telecom.PhoneAccountHandle> getRegisteredConnectionManagers();
		method public android.telecom.PhoneAccountHandle getSimCallManager();
		method public android.telecom.PhoneAccountHandle getUserSelectedOutgoingPhoneAccount();
		method public boolean handleMmi(java.lang.String);
		method public boolean handleMmi(java.lang.String, android.telecom.PhoneAccountHandle);
		method public boolean hasVoiceMailNumber(android.telecom.PhoneAccountHandle);
		@@ -32322,6 +32414,7 @@ package android.telecom {
		method public void unregisterPhoneAccount(android.telecom.PhoneAccountHandle);
		field public static final java.lang.String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecom.action.CHANGE_PHONE_ACCOUNTS";
		field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.telecom.action.CONNECTION_SERVICE_CONFIGURE";
		field public static final java.lang.String ACTION_INCOMING_CALL = "android.telecom.action.INCOMING_CALL";
		field public static final java.lang.String ACTION_PHONE_ACCOUNT_REGISTERED = "android.telecom.action.PHONE_ACCOUNT_REGISTERED";
		field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS";
		field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS";
		@@ -32866,6 +32959,7 @@ package android.telephony {
		method public boolean getDataEnabled(int);
		method public int getDataState();
		method public java.lang.String getDeviceId();
		method public java.lang.String getDeviceId(int);
		method public java.lang.String getDeviceSoftwareVersion();
		method public java.lang.String getGroupIdLevel1();
		method public java.lang.String getLine1Number();
		@@ -32876,6 +32970,7 @@ package android.telephony {
		method public java.lang.String getNetworkOperator();
		method public java.lang.String getNetworkOperatorName();
		method public int getNetworkType();
		method public int getPhoneCount();
		method public int getPhoneType();
		method public java.lang.String getSimCountryIso();
		method public java.lang.String getSimOperator();
		@@ -60220,3 +60315,4 @@ package org.xmlpull.v1.sax2 {
		}

		}

core/java/android/provider/Settings.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -2766,8 +2766,6 @@ public final class Settings {
		* It was about AudioManager's setting and thus affected all the applications which
		* relied on the setting, while this is purely about the vibration setting for incoming
		* calls.
		*
		* @hide
		*/
		public static final String VIBRATE_WHEN_RINGING = "vibrate_when_ringing";

		@@ -2788,7 +2786,6 @@ public final class Settings {
		* DTMF tone type played by the dialer when dialing.
		* 0 = Normal
		* 1 = Long
		* @hide
		*/
		public static final String DTMF_TONE_TYPE_WHEN_DIALING = "dtmf_tone_type";

		@@ -7057,7 +7054,6 @@ public final class Settings {
		/**
		* Setting to 1 will hide carrier network settings.
		* Default is 0.
		* @hide
		*/
		public static final String HIDE_CARRIER_NETWORK_SETTINGS =
		"hide_carrier_network_settings";

telecomm/java/android/telecom/AudioState.java

+2 −9

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package android.telecom;

		import android.annotation.SystemApi;
		import android.os.Parcel;
		import android.os.Parcelable;

		@@ -25,9 +24,7 @@ import java.util.Locale;
		/**
		* Encapsulates the telecom audio state, including the current audio routing, supported audio
		* routing and mute.
		* @hide
		*/
		@SystemApi
		public final class AudioState implements Parcelable {
		/** Direct the audio stream through the device's earpiece. */
		public static final int ROUTE_EARPIECE = 0x00000001;
		@@ -47,11 +44,8 @@ public final class AudioState implements Parcelable {
		*/
		public static final int ROUTE_WIRED_OR_EARPIECE = ROUTE_EARPIECE \| ROUTE_WIRED_HEADSET;

		/** Bit mask of all possible audio routes.
		*
		* @hide
		*/
		public static final int ROUTE_ALL = ROUTE_EARPIECE \| ROUTE_BLUETOOTH \| ROUTE_WIRED_HEADSET \|
		/** Bit mask of all possible audio routes. */
		private static final int ROUTE_ALL = ROUTE_EARPIECE \| ROUTE_BLUETOOTH \| ROUTE_WIRED_HEADSET \|
		ROUTE_SPEAKER;

		private final boolean isMuted;
		@@ -92,7 +86,6 @@ public final class AudioState implements Parcelable {
		audioRouteToString(supportedRouteMask));
		}

		/** @hide */
		public static String audioRouteToString(int route) {
		if (route == 0 \|\| (route & ~ROUTE_ALL) != 0x0) {
		return "UNKNOWN";

telecomm/java/android/telecom/Call.java

+0 −22

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package android.telecom;

		import android.annotation.SystemApi;
		import android.net.Uri;
		import android.os.Bundle;

		@@ -30,10 +29,7 @@ import java.util.concurrent.CopyOnWriteArrayList;

		/**
		* Represents an ongoing phone call that the in-call app should present to the user.
		*
		* {@hide}
		*/
		@SystemApi
		public final class Call {
		/**
		* The state of a {@code Call} when newly created.
		@@ -91,8 +87,6 @@ public final class Call {
		* The key to retrieve the optional {@code PhoneAccount}s Telecom can bundle with its Call
		* extras. Used to pass the phone accounts to display on the front end to the user in order to
		* select phone accounts to (for example) place a call.
		*
		* @hide
		*/
		public static final String AVAILABLE_PHONE_ACCOUNTS = "selectPhoneAccountAccounts";

		@@ -142,38 +136,32 @@ public final class Call {

		/**
		* Local device supports receiving video.
		* @hide
		*/
		public static final int CAPABILITY_SUPPORTS_VT_LOCAL_RX = 0x00000100;

		/**
		* Local device supports transmitting video.
		* @hide
		*/
		public static final int CAPABILITY_SUPPORTS_VT_LOCAL_TX = 0x00000200;

		/**
		* Local device supports bidirectional video calling.
		* @hide
		*/
		public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL =
		CAPABILITY_SUPPORTS_VT_LOCAL_RX \| CAPABILITY_SUPPORTS_VT_LOCAL_TX;

		/**
		* Remote device supports receiving video.
		* @hide
		*/
		public static final int CAPABILITY_SUPPORTS_VT_REMOTE_RX = 0x00000400;

		/**
		* Remote device supports transmitting video.
		* @hide
		*/
		public static final int CAPABILITY_SUPPORTS_VT_REMOTE_TX = 0x00000800;

		/**
		* Remote device supports bidirectional video calling.
		* @hide
		*/
		public static final int CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL =
		CAPABILITY_SUPPORTS_VT_REMOTE_RX \| CAPABILITY_SUPPORTS_VT_REMOTE_TX;
		@@ -191,27 +179,21 @@ public final class Call {
		/**
		* Whether the call is a generic conference, where we do not know the precise state of
		* participants in the conference (eg. on CDMA).
		*
		* @hide
		*/
		public static final int CAPABILITY_GENERIC_CONFERENCE = 0x00004000;

		/**
		* Call is using high definition audio.
		* @hide
		*/
		public static final int CAPABILITY_HIGH_DEF_AUDIO = 0x00008000;

		/**
		* Call is using WIFI.
		* @hide
		*/
		public static final int CAPABILITY_WIFI = 0x00010000;

		/**
		* Indicates that the current device callback number should be shown.
		*
		* @hide
		*/
		public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00020000;

		@@ -252,7 +234,6 @@ public final class Call {
		* @param capabilities A bit field of capabilities.
		* @param capability The capability to check capabilities for.
		* @return Whether the specified capability is supported.
		* @hide
		*/
		public static boolean can(int capabilities, int capability) {
		return (capabilities & capability) != 0;
		@@ -263,7 +244,6 @@ public final class Call {
		*
		* @param capability The capability to check capabilities for.
		* @return Whether the specified capability is supported.
		* @hide
		*/
		public boolean can(int capability) {
		return can(mCallCapabilities, capability);
		@@ -583,7 +563,6 @@ public final class Call {
		*
		* @param call The {@code Call} invoking this method.
		* @param videoCall The {@code Call.VideoCall} associated with the {@code Call}.
		* @hide
		*/
		public void onVideoCallChanged(Call call, InCallService.VideoCall videoCall) {}

		@@ -836,7 +815,6 @@ public final class Call {
		* Obtains an object that can be used to display video from this {@code Call}.
		*
		* @return An {@code Call.VideoCall}.
		* @hide
		*/
		public InCallService.VideoCall getVideoCall() {
		return mVideoCall;