Merge "Ensure Exceptions when reporting Transaction results does not cause a stall" into main (f5094557) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/voip/TransactionManager.java

+18 −8

Original line number	Diff line number	Diff line
		@@ -81,6 +81,7 @@ public class TransactionManager {
		String transactionName) {
		Log.i(TAG, String.format("transaction %s completed: with result=[%d]",
		transactionName, result.getResult()));
		try {
		if (result.getResult() == TelecomManager.TELECOM_TRANSACTION_SUCCESS) {
		receiver.onResult(result);
		} else {
		@@ -88,14 +89,23 @@ public class TransactionManager {
		new CallException(result.getMessage(),
		result.getResult()));
		}
		} catch (Exception e) {
		Log.e(TAG, String.format("onTransactionCompleted: Notifying transaction result"
		+ " %s resulted in an Exception.", result), e);
		}
		finishTransaction();
		}

		@Override
		public void onTransactionTimeout(String transactionName){
		Log.i(TAG, String.format("transaction %s timeout", transactionName));
		try {
		receiver.onError(new CallException(transactionName + " timeout",
		CODE_OPERATION_TIMED_OUT));
		} catch (Exception e) {
		Log.e(TAG, String.format("onTransactionTimeout: Notifying transaction "
		+ " %s resulted in an Exception.", transactionName), e);
		}
		finishTransaction();
		}
		});

tests/src/com/android/server/telecom/tests/VoipCallTransactionTest.java

+87 −1

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ public class VoipCallTransactionTest extends TelecomTestCase {
		public static final int SUCCESS = 0;
		public static final int FAILED = 1;
		public static final int TIMEOUT = 2;
		public static final int EXCEPTION = 3;

		private long mSleepTime;
		private String mName;
		@@ -70,6 +71,10 @@ public class VoipCallTransactionTest extends TelecomTestCase {

		@Override
		public CompletionStage<VoipCallTransactionResult> processTransaction(Void v) {
		if (mType == EXCEPTION) {
		mLog.append(mName).append(" exception;\n");
		throw new IllegalStateException("TEST EXCEPTION");
		}
		CompletableFuture<VoipCallTransactionResult> resultFuture = new CompletableFuture<>();
		mHandler.postDelayed(() -> {
		if (mType == SUCCESS) {
		@@ -246,8 +251,89 @@ public class VoipCallTransactionTest extends TelecomTestCase {
		public void onError(CallException e) {
		exceptionFuture.complete(e.getMessage());
		}
		}; mTransactionManager.addTransaction(t, outcomeReceiver);
		};
		mTransactionManager.addTransaction(t, outcomeReceiver);
		String message = exceptionFuture.get(7000L, TimeUnit.MILLISECONDS);
		assertTrue(message.contains("timeout"));
		}

		@SmallTest
		@Test
		public void testTransactionException()
		throws ExecutionException, InterruptedException, TimeoutException {
		VoipCallTransaction t1 = new TestVoipCallTransaction("t1", 1000L,
		TestVoipCallTransaction.EXCEPTION);
		VoipCallTransaction t2 = new TestVoipCallTransaction("t2", 1000L,
		TestVoipCallTransaction.SUCCESS);
		CompletableFuture<String> exceptionFuture = new CompletableFuture<>();
		OutcomeReceiver<VoipCallTransactionResult, CallException> outcomeExceptionReceiver =
		new OutcomeReceiver<>() {
		@Override
		public void onResult(VoipCallTransactionResult result) {
		}

		@Override
		public void onError(CallException e) {
		exceptionFuture.complete(e.getMessage());
		}
		};
		mTransactionManager.addTransaction(t1, outcomeExceptionReceiver);
		// Transaction will timeout because the Exception caused the transaction to stop processing.
		exceptionFuture.get(7000L, TimeUnit.MILLISECONDS);
		assertTrue(mLog.toString().contains("t1 exception;\n"));
		// Verify an exception in a processing a previous transaction does not stall the next one.
		CompletableFuture<VoipCallTransactionResult> resultFuture = new CompletableFuture<>();
		OutcomeReceiver<VoipCallTransactionResult, CallException> outcomeReceiver =
		resultFuture::complete;
		mTransactionManager.addTransaction(t2, outcomeReceiver);
		String expectedLog = "t1 exception;\nt2 success;\n";
		assertEquals(VoipCallTransactionResult.RESULT_SUCCEED,
		resultFuture.get(5000L, TimeUnit.MILLISECONDS).getResult());
		assertEquals(expectedLog, mLog.toString());
		}

		@SmallTest
		@Test
		public void testTransactionResultException()
		throws ExecutionException, InterruptedException, TimeoutException {
		VoipCallTransaction t1 = new TestVoipCallTransaction("t1", 1000L,
		TestVoipCallTransaction.SUCCESS);
		VoipCallTransaction t2 = new TestVoipCallTransaction("t2", 1000L,
		TestVoipCallTransaction.SUCCESS);
		VoipCallTransaction t3 = new TestVoipCallTransaction("t3", 1000L,
		TestVoipCallTransaction.SUCCESS);
		OutcomeReceiver<VoipCallTransactionResult, CallException> outcomeExceptionReceiver =
		new OutcomeReceiver<>() {
		@Override
		public void onResult(VoipCallTransactionResult result) {
		throw new IllegalStateException("RESULT EXCEPTION");
		}

		@Override
		public void onError(CallException e) {
		}
		};
		mTransactionManager.addTransaction(t1, outcomeExceptionReceiver);
		OutcomeReceiver<VoipCallTransactionResult, CallException> outcomeException2Receiver =
		new OutcomeReceiver<>() {
		@Override
		public void onResult(VoipCallTransactionResult result) {
		}

		@Override
		public void onError(CallException e) {
		throw new IllegalStateException("RESULT EXCEPTION");
		}
		};
		mTransactionManager.addTransaction(t2, outcomeException2Receiver);
		// Verify an exception in a previous transaction result does not stall the next one.
		CompletableFuture<VoipCallTransactionResult> resultFuture = new CompletableFuture<>();
		OutcomeReceiver<VoipCallTransactionResult, CallException> outcomeReceiver =
		resultFuture::complete;
		mTransactionManager.addTransaction(t3, outcomeReceiver);
		String expectedLog = "t1 success;\nt2 success;\nt3 success;\n";
		assertEquals(VoipCallTransactionResult.RESULT_SUCCEED,
		resultFuture.get(5000L, TimeUnit.MILLISECONDS).getResult());
		assertEquals(expectedLog, mLog.toString());
		}
		}