Merge "Merge "Run CtsTelecomTestCases in presubmit" am: 1b2995ca3f am:... (005ab288) · Commits · e / os / android_frameworks_base

cmds/telecom/src/com/android/commands/telecom/Telecom.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@ public final class Telecom extends BaseCommand {
		private static final String COMMAND_SET_DEFAULT_DIALER = "set-default-dialer";
		private static final String COMMAND_GET_DEFAULT_DIALER = "get-default-dialer";
		private static final String COMMAND_STOP_BLOCK_SUPPRESSION = "stop-block-suppression";
		private static final String COMMAND_CLEANUP_STUCK_CALLS = "cleanup-stuck-calls";

		/**
		* Change the system dialer package name if a package name was specified,
		@@ -119,6 +120,8 @@ public final class Telecom extends BaseCommand {
		+ "usage: telecom get-max-phones\n"
		+ "usage: telecom stop-block-suppression: Stop suppressing the blocked number"
		+ " provider after a call to emergency services.\n"
		+ "usage: telecom cleanup-stuck-calls: Clear any disconnected calls that have"
		+ " gotten wedged in Telecom.\n"
		+ "usage: telecom set-emer-phone-account-filter <PACKAGE>\n"
		+ "\n"
		+ "telecom set-phone-account-enabled: Enables the given phone account, if it has"
		@@ -214,6 +217,9 @@ public final class Telecom extends BaseCommand {
		case COMMAND_STOP_BLOCK_SUPPRESSION:
		runStopBlockSuppression();
		break;
		case COMMAND_CLEANUP_STUCK_CALLS:
		runCleanupStuckCalls();
		break;
		case COMMAND_SET_DEFAULT_DIALER:
		runSetDefaultDialer();
		break;
		@@ -335,6 +341,10 @@ public final class Telecom extends BaseCommand {
		mTelecomService.stopBlockSuppression();
		}

		private void runCleanupStuckCalls() throws RemoteException {
		mTelecomService.cleanupStuckCalls();
		}

		private void runSetDefaultDialer() throws RemoteException {
		String packageName = nextArg();
		if ("default".equals(packageName)) packageName = null;

telecomm/TEST_MAPPING

+8 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,14 @@
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		},
		{
		"name": "CtsTelecomTestCases",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		}
		]
		}

telecomm/java/com/android/internal/telecom/ITelecomService.aidl

+2 −0

Original line number	Diff line number	Diff line
		@@ -326,6 +326,8 @@ interface ITelecomService {
		*/
		void handleCallIntent(in Intent intent, in String callingPackageProxy);

		void cleanupStuckCalls();

		void setTestDefaultCallRedirectionApp(String packageName);

		void setTestPhoneAcctSuggestionComponent(String flattenedComponentName);