Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle CancellationException in BackupTransportClient" into tm-dev

Browse Source
This commit is contained in:
Ruslan Tkhakokhov
2022-04-05 16:59:50 +00:00
committed by Android (Google) Code Review
parent 847bd13590 9d77aef642
commit 22f211ca1e
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/backup/backuplib/java/com/android/server/backup/transport/BackupTransportClient.java
View File

@@ -34,6 +34,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@ -374,7 +375,8 @@ public class BackupTransportClient {
private <T> T getFutureResult(AndroidFuture<T> future) {
try {
return future.get(600, TimeUnit.SECONDS);
} catch (InterruptedException | ExecutionException | TimeoutException e) {
} catch (InterruptedException | ExecutionException | TimeoutException
| CancellationException e) {
Slog.w(TAG, "Failed to get result from transport:", e);
return null;
} finally {
@@ -403,7 +405,11 @@ public class BackupTransportClient {
void cancelActiveFutures() {
synchronized (mActiveFuturesLock) {
for (AndroidFuture<?> future : mActiveFutures) {
future.cancel(true);
try {
future.cancel(true);
} catch (CancellationException ignored) {
// This is expected, so ignore the exception.
}
}
mActiveFutures.clear();
}

7
services/tests/servicestests/src/com/android/server/backup/transport/BackupTransportClientTest.java
View File

@@ -110,10 +110,7 @@ public class BackupTransportClientTest {
Thread thread = new Thread(() -> {
try {
/*String name =*/ client.transportDirName();
fail("transportDirName should be cancelled");
} catch (CancellationException ex) {
// This is expected.
assertThat(client.transportDirName()).isNull();
} catch (Exception ex) {
fail("unexpected Exception: " + ex.getClass().getCanonicalName());
}
@@ -189,7 +186,7 @@ public class BackupTransportClientTest {
}
@Test
public void testFinishBackup_canceledBeforeCompletion_throwsException() throws Exception {
public void testFinishBackup_canceledBeforeCompletion_returnsError() throws Exception {
TestCallbacksFakeTransportBinder binder = new TestCallbacksFakeTransportBinder();
BackupTransportClient client = new BackupTransportClient(binder);