Merge "Adding self-managed connection service APIs." (2155be02) · Commits · e / os / android_frameworks_base

api/current.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@ package android {
		field public static final java.lang.String KILL_BACKGROUND_PROCESSES = "android.permission.KILL_BACKGROUND_PROCESSES";
		field public static final java.lang.String LOCATION_HARDWARE = "android.permission.LOCATION_HARDWARE";
		field public static final java.lang.String MANAGE_DOCUMENTS = "android.permission.MANAGE_DOCUMENTS";
		field public static final java.lang.String MANAGE_OWN_CALLS = "android.permission.MANAGE_OWN_CALLS";
		field public static final java.lang.String MASTER_CLEAR = "android.permission.MASTER_CLEAR";
		field public static final java.lang.String MEDIA_CONTENT_CONTROL = "android.permission.MEDIA_CONTENT_CONTROL";
		field public static final java.lang.String MODIFY_AUDIO_SETTINGS = "android.permission.MODIFY_AUDIO_SETTINGS";
		@@ -36452,6 +36453,7 @@ package android.telecom {
		method public void onReject();
		method public void onReject(java.lang.String);
		method public void onSeparate();
		method public void onShowIncomingCallUi();
		method public void onStateChanged(int);
		method public void onStopDtmfTone();
		method public void onUnhold();
		@@ -36463,6 +36465,7 @@ package android.telecom {
		method public final void setActive();
		method public final void setAddress(android.net.Uri, int);
		method public final void setAudioModeIsVoip(boolean);
		method public final void setAudioRoute(int);
		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.Conferenceable>);
		@@ -36511,6 +36514,7 @@ package android.telecom {
		field public static final java.lang.String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER";
		field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 32; // 0x20
		field public static final int PROPERTY_IS_EXTERNAL_CALL = 16; // 0x10
		field public static final int PROPERTY_SELF_MANAGED = 128; // 0x80
		field public static final int STATE_ACTIVE = 4; // 0x4
		field public static final int STATE_DIALING = 3; // 0x3
		field public static final int STATE_DISCONNECTED = 6; // 0x6
		@@ -36577,7 +36581,9 @@ package android.telecom {
		method public final android.os.IBinder onBind(android.content.Intent);
		method public void onConference(android.telecom.Connection, android.telecom.Connection);
		method public android.telecom.Connection onCreateIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		method public void onCreateIncomingConnectionFailed(android.telecom.ConnectionRequest);
		method public android.telecom.Connection onCreateOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		method public void onCreateOutgoingConnectionFailed(android.telecom.ConnectionRequest);
		method public void onRemoteConferenceAdded(android.telecom.RemoteConference);
		method public void onRemoteExistingConnectionAdded(android.telecom.RemoteConnection);
		field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.ConnectionService";
		@@ -36690,6 +36696,7 @@ package android.telecom {
		field public static final int CAPABILITY_CALL_SUBJECT = 64; // 0x40
		field public static final int CAPABILITY_CONNECTION_MANAGER = 1; // 0x1
		field public static final int CAPABILITY_PLACE_EMERGENCY_CALLS = 16; // 0x10
		field public static final int CAPABILITY_SELF_MANAGED = 2048; // 0x800
		field public static final int CAPABILITY_SIM_SUBSCRIPTION = 4; // 0x4
		field public static final int CAPABILITY_SUPPORTS_VIDEO_CALLING = 1024; // 0x400
		field public static final int CAPABILITY_VIDEO_CALLING = 8; // 0x8
		@@ -36871,6 +36878,8 @@ package android.telecom {
		method public boolean handleMmi(java.lang.String);
		method public boolean handleMmi(java.lang.String, android.telecom.PhoneAccountHandle);
		method public boolean isInCall();
		method public boolean isIncomingCallPermitted(android.telecom.PhoneAccountHandle);
		method public boolean isOutgoingCallPermitted(android.telecom.PhoneAccountHandle);
		method public boolean isVoiceMailNumber(android.telecom.PhoneAccountHandle, java.lang.String);
		method public void placeCall(android.net.Uri, android.os.Bundle);
		method public void registerPhoneAccount(android.telecom.PhoneAccount);

api/system-current.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -135,6 +135,7 @@ package android {
		field public static final java.lang.String MANAGE_CA_CERTIFICATES = "android.permission.MANAGE_CA_CERTIFICATES";
		field public static final java.lang.String MANAGE_DEVICE_ADMINS = "android.permission.MANAGE_DEVICE_ADMINS";
		field public static final java.lang.String MANAGE_DOCUMENTS = "android.permission.MANAGE_DOCUMENTS";
		field public static final java.lang.String MANAGE_OWN_CALLS = "android.permission.MANAGE_OWN_CALLS";
		field public static final java.lang.String MANAGE_USB = "android.permission.MANAGE_USB";
		field public static final java.lang.String MANAGE_USERS = "android.permission.MANAGE_USERS";
		field public static final java.lang.String MASTER_CLEAR = "android.permission.MASTER_CLEAR";
		@@ -39422,6 +39423,7 @@ package android.telecom {
		method public void onReject();
		method public void onReject(java.lang.String);
		method public void onSeparate();
		method public void onShowIncomingCallUi();
		method public void onStateChanged(int);
		method public void onStopDtmfTone();
		method public void onUnhold();
		@@ -39433,6 +39435,7 @@ package android.telecom {
		method public final void setActive();
		method public final void setAddress(android.net.Uri, int);
		method public final void setAudioModeIsVoip(boolean);
		method public final void setAudioRoute(int);
		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.Conferenceable>);
		@@ -39481,6 +39484,7 @@ package android.telecom {
		field public static final java.lang.String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER";
		field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 32; // 0x20
		field public static final int PROPERTY_IS_EXTERNAL_CALL = 16; // 0x10
		field public static final int PROPERTY_SELF_MANAGED = 128; // 0x80
		field public static final int STATE_ACTIVE = 4; // 0x4
		field public static final int STATE_DIALING = 3; // 0x3
		field public static final int STATE_DISCONNECTED = 6; // 0x6
		@@ -39547,7 +39551,9 @@ package android.telecom {
		method public final android.os.IBinder onBind(android.content.Intent);
		method public void onConference(android.telecom.Connection, android.telecom.Connection);
		method public android.telecom.Connection onCreateIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		method public void onCreateIncomingConnectionFailed(android.telecom.ConnectionRequest);
		method public android.telecom.Connection onCreateOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		method public void onCreateOutgoingConnectionFailed(android.telecom.ConnectionRequest);
		method public void onRemoteConferenceAdded(android.telecom.RemoteConference);
		method public void onRemoteExistingConnectionAdded(android.telecom.RemoteConnection);
		field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.ConnectionService";
		@@ -39784,6 +39790,7 @@ package android.telecom {
		field public static final int CAPABILITY_CONNECTION_MANAGER = 1; // 0x1
		field public static final int CAPABILITY_MULTI_USER = 32; // 0x20
		field public static final int CAPABILITY_PLACE_EMERGENCY_CALLS = 16; // 0x10
		field public static final int CAPABILITY_SELF_MANAGED = 2048; // 0x800
		field public static final int CAPABILITY_SIM_SUBSCRIPTION = 4; // 0x4
		field public static final int CAPABILITY_SUPPORTS_VIDEO_CALLING = 1024; // 0x400
		field public static final int CAPABILITY_VIDEO_CALLING = 8; // 0x8
		@@ -40022,6 +40029,8 @@ package android.telecom {
		method public boolean handleMmi(java.lang.String);
		method public boolean handleMmi(java.lang.String, android.telecom.PhoneAccountHandle);
		method public boolean isInCall();
		method public boolean isIncomingCallPermitted(android.telecom.PhoneAccountHandle);
		method public boolean isOutgoingCallPermitted(android.telecom.PhoneAccountHandle);
		method public boolean isRinging();
		method public boolean isTtySupported();
		method public boolean isVoiceMailNumber(android.telecom.PhoneAccountHandle, java.lang.String);

api/test-current.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@ package android {
		field public static final java.lang.String KILL_BACKGROUND_PROCESSES = "android.permission.KILL_BACKGROUND_PROCESSES";
		field public static final java.lang.String LOCATION_HARDWARE = "android.permission.LOCATION_HARDWARE";
		field public static final java.lang.String MANAGE_DOCUMENTS = "android.permission.MANAGE_DOCUMENTS";
		field public static final java.lang.String MANAGE_OWN_CALLS = "android.permission.MANAGE_OWN_CALLS";
		field public static final java.lang.String MASTER_CLEAR = "android.permission.MASTER_CLEAR";
		field public static final java.lang.String MEDIA_CONTENT_CONTROL = "android.permission.MEDIA_CONTENT_CONTROL";
		field public static final java.lang.String MODIFY_AUDIO_SETTINGS = "android.permission.MODIFY_AUDIO_SETTINGS";
		@@ -36534,6 +36535,7 @@ package android.telecom {
		method public void onReject();
		method public void onReject(java.lang.String);
		method public void onSeparate();
		method public void onShowIncomingCallUi();
		method public void onStateChanged(int);
		method public void onStopDtmfTone();
		method public void onUnhold();
		@@ -36545,6 +36547,7 @@ package android.telecom {
		method public final void setActive();
		method public final void setAddress(android.net.Uri, int);
		method public final void setAudioModeIsVoip(boolean);
		method public final void setAudioRoute(int);
		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.Conferenceable>);
		@@ -36593,6 +36596,7 @@ package android.telecom {
		field public static final java.lang.String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER";
		field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 32; // 0x20
		field public static final int PROPERTY_IS_EXTERNAL_CALL = 16; // 0x10
		field public static final int PROPERTY_SELF_MANAGED = 128; // 0x80
		field public static final int STATE_ACTIVE = 4; // 0x4
		field public static final int STATE_DIALING = 3; // 0x3
		field public static final int STATE_DISCONNECTED = 6; // 0x6
		@@ -36659,7 +36663,9 @@ package android.telecom {
		method public final android.os.IBinder onBind(android.content.Intent);
		method public void onConference(android.telecom.Connection, android.telecom.Connection);
		method public android.telecom.Connection onCreateIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		method public void onCreateIncomingConnectionFailed(android.telecom.ConnectionRequest);
		method public android.telecom.Connection onCreateOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		method public void onCreateOutgoingConnectionFailed(android.telecom.ConnectionRequest);
		method public void onRemoteConferenceAdded(android.telecom.RemoteConference);
		method public void onRemoteExistingConnectionAdded(android.telecom.RemoteConnection);
		field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.ConnectionService";
		@@ -36772,6 +36778,7 @@ package android.telecom {
		field public static final int CAPABILITY_CALL_SUBJECT = 64; // 0x40
		field public static final int CAPABILITY_CONNECTION_MANAGER = 1; // 0x1
		field public static final int CAPABILITY_PLACE_EMERGENCY_CALLS = 16; // 0x10
		field public static final int CAPABILITY_SELF_MANAGED = 2048; // 0x800
		field public static final int CAPABILITY_SIM_SUBSCRIPTION = 4; // 0x4
		field public static final int CAPABILITY_SUPPORTS_VIDEO_CALLING = 1024; // 0x400
		field public static final int CAPABILITY_VIDEO_CALLING = 8; // 0x8
		@@ -36953,6 +36960,8 @@ package android.telecom {
		method public boolean handleMmi(java.lang.String);
		method public boolean handleMmi(java.lang.String, android.telecom.PhoneAccountHandle);
		method public boolean isInCall();
		method public boolean isIncomingCallPermitted(android.telecom.PhoneAccountHandle);
		method public boolean isOutgoingCallPermitted(android.telecom.PhoneAccountHandle);
		method public boolean isVoiceMailNumber(android.telecom.PhoneAccountHandle, java.lang.String);
		method public void placeCall(android.net.Uri, android.os.Bundle);
		method public void registerPhoneAccount(android.telecom.PhoneAccount);

core/res/AndroidManifest.xml

+10 −0

Original line number	Diff line number	Diff line
		@@ -778,6 +778,16 @@
		android:description="@string/permdesc_callPhone"
		android:protectionLevel="dangerous" />

		<!-- Allows an application to manage its own calls, but rely on the system to route focus to the
		currently active call.
		<p>Protection level: dangerous
		-->
		<permission android:name="android.permission.MANAGE_OWN_CALLS"
		android:permissionGroup="android.permission-group.PHONE"
		android:label="@string/permlab_manageOwnCalls"
		android:description="@string/permdesc_manageOwnCalls"
		android:protectionLevel="dangerous" />

		<!-- Allows an application to access the IMS call service: making and
		modifying a call
		<p>Protection level: signature\|privileged

core/res/res/values/strings.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -1056,6 +1056,14 @@
		phone number and device IDs, whether a call is active, and the remote number
		connected by a call.</string>

		<!-- Title of an application permission. When granted the user is giving access to a third
		party app to route its calls through the system. -->
		<string name="permlab_manageOwnCalls">route calls through the system</string>
		<!-- Description of an application permission. When granted the user is giving access to a
		third party app to route its calls through the system. -->
		<string name="permdesc_manageOwnCalls">Allows the app to route its calls through the system in
		order to improve the calling experience.</string>

		<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
		<string name="permlab_wakeLock" product="tablet">prevent tablet from sleeping</string>
		<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->