Merge "Expose some APIs as test APIs to facilitate CTS" (ebf53906) · Commits · e / os / android_frameworks_base

api/test-current.txt

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1439,6 +1439,10 @@ package android.telecom {
	ctor public CallAudioState(boolean, int, int, @Nullable android.bluetooth.BluetoothDevice, @NonNull java.util.Collection<android.bluetooth.BluetoothDevice>);		ctor public CallAudioState(boolean, int, int, @Nullable android.bluetooth.BluetoothDevice, @NonNull java.util.Collection<android.bluetooth.BluetoothDevice>);
	}		}

			public abstract class Conference extends android.telecom.Conferenceable {
			method public android.telecom.Connection getPrimaryConnection();
			}

	public final class PhoneAccountSuggestion implements android.os.Parcelable {		public final class PhoneAccountSuggestion implements android.os.Parcelable {
	ctor public PhoneAccountSuggestion(@NonNull android.telecom.PhoneAccountHandle, int, boolean);		ctor public PhoneAccountSuggestion(@NonNull android.telecom.PhoneAccountHandle, int, boolean);
	}		}
	@@ -1451,6 +1455,16 @@ package android.telecom {
	field public static final String SERVICE_INTERFACE = "android.telecom.PhoneAccountSuggestionService";		field public static final String SERVICE_INTERFACE = "android.telecom.PhoneAccountSuggestionService";
	}		}

			public class TelecomManager {
			method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public int getCurrentTtyMode();
			method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean isInEmergencyCall();
			method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUserSelectedOutgoingPhoneAccount(android.telecom.PhoneAccountHandle);
			field public static final int TTY_MODE_FULL = 1; // 0x1
			field public static final int TTY_MODE_HCO = 2; // 0x2
			field public static final int TTY_MODE_OFF = 0; // 0x0
			field public static final int TTY_MODE_VCO = 3; // 0x3
			}

	}		}

	package android.telephony {		package android.telephony {

telecomm/java/android/telecom/Conference.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@ package android.telecom;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
			import android.annotation.TestApi;
	import android.net.Uri;		import android.net.Uri;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.SystemClock;		import android.os.SystemClock;
	@@ -571,6 +572,7 @@ public abstract class Conference extends Conferenceable {
	* @return The primary connection.		* @return The primary connection.
	* @hide		* @hide
	*/		*/
			@TestApi
	@SystemApi		@SystemApi
	public Connection getPrimaryConnection() {		public Connection getPrimaryConnection() {
	if (mUnmodifiableChildConnections == null \|\| mUnmodifiableChildConnections.isEmpty()) {		if (mUnmodifiableChildConnections == null \|\| mUnmodifiableChildConnections.isEmpty()) {

telecomm/java/android/telecom/TelecomManager.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@ import android.annotation.SuppressAutoDoc;
	import android.annotation.SuppressLint;		import android.annotation.SuppressLint;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
	import android.annotation.SystemService;		import android.annotation.SystemService;
			import android.annotation.TestApi;
	import android.annotation.UnsupportedAppUsage;		import android.annotation.UnsupportedAppUsage;
	import android.content.ComponentName;		import android.content.ComponentName;
	import android.content.Context;		import android.content.Context;
	@@ -560,6 +561,7 @@ public class TelecomManager {
	*		*
	* @hide		* @hide
	*/		*/
			@TestApi
	@SystemApi		@SystemApi
	public static final int TTY_MODE_OFF = 0;		public static final int TTY_MODE_OFF = 0;

	@@ -569,6 +571,7 @@ public class TelecomManager {
	*		*
	* @hide		* @hide
	*/		*/
			@TestApi
	@SystemApi		@SystemApi
	public static final int TTY_MODE_FULL = 1;		public static final int TTY_MODE_FULL = 1;

	@@ -579,6 +582,7 @@ public class TelecomManager {
	*		*
	* @hide		* @hide
	*/		*/
			@TestApi
	@SystemApi		@SystemApi
	public static final int TTY_MODE_HCO = 2;		public static final int TTY_MODE_HCO = 2;

	@@ -589,6 +593,7 @@ public class TelecomManager {
	*		*
	* @hide		* @hide
	*/		*/
			@TestApi
	@SystemApi		@SystemApi
	public static final int TTY_MODE_VCO = 3;		public static final int TTY_MODE_VCO = 3;

	@@ -827,6 +832,7 @@ public class TelecomManager {
	* @hide		* @hide
	*/		*/
	@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
			@TestApi
	@SystemApi		@SystemApi
	public void setUserSelectedOutgoingPhoneAccount(PhoneAccountHandle accountHandle) {		public void setUserSelectedOutgoingPhoneAccount(PhoneAccountHandle accountHandle) {
	try {		try {
	@@ -1527,6 +1533,7 @@ public class TelecomManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
			@TestApi
	@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
	public @TtyMode int getCurrentTtyMode() {		public @TtyMode int getCurrentTtyMode() {
	try {		try {
	@@ -1975,6 +1982,7 @@ public class TelecomManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
			@TestApi
	@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
	public boolean isInEmergencyCall() {		public boolean isInEmergencyCall() {
	try {		try {