summaryrefslogtreecommitdiff
path: root/services/robotests/src
diff options
context:
space:
mode:
author Ruslan Tkhakokhov <rthakohov@google.com> 2021-11-24 23:19:55 +0000
committer Ruslan Tkhakokhov <rthakohov@google.com> 2021-11-25 22:19:13 +0000
commitf39ab7029dfbd92eff75561580fb0a2b69b69e24 (patch)
tree8429a68ce65def5ccc375beae795449bbf7380b9 /services/robotests/src
parent5169896db8741a7d1cadefb3616d8f1ed604fef6 (diff)
Rename TransportClient to TransportConnection
The change is auto-generated through IDE rename function and makes the following naming changes: 1. TransportClient -> TransportConnection 2. TransportClientManager -> TransportConnectionManager 3. + corresponding test files TransportConnection is a more appropriate name for the class as it's exactly what it does - manages the connection to the remote BackupTransport service implementation. This is a preparatory change to making the BackupTransport AIDL async. TransportClient name will later be used more appropriately for a class that wraps the actual communication with the transport. Bug: 202716271 Test: m -j Change-Id: I76a98edc7102c8fcffdb050208e9e65543e6e10c
Diffstat (limited to 'services/robotests/src')
-rw-r--r--services/robotests/src/com/android/server/testing/shadows/ShadowBackupEligibilityRules.java5
-rw-r--r--services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java4
-rw-r--r--services/robotests/src/com/android/server/testing/shadows/ShadowPerformUnifiedRestoreTask.java7
3 files changed, 6 insertions, 10 deletions
diff --git a/services/robotests/src/com/android/server/testing/shadows/ShadowBackupEligibilityRules.java b/services/robotests/src/com/android/server/testing/shadows/ShadowBackupEligibilityRules.java
index 566b0e151402..9a74977ef6d4 100644
--- a/services/robotests/src/com/android/server/testing/shadows/ShadowBackupEligibilityRules.java
+++ b/services/robotests/src/com/android/server/testing/shadows/ShadowBackupEligibilityRules.java
@@ -19,9 +19,8 @@ package com.android.server.testing.shadows;
import android.annotation.Nullable;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import com.android.server.backup.transport.TransportClient;
+import com.android.server.backup.transport.TransportConnection;
import com.android.server.backup.utils.BackupEligibilityRules;
import org.robolectric.annotation.Implementation;
@@ -54,7 +53,7 @@ public class ShadowBackupEligibilityRules {
@Implementation
protected boolean appIsRunningAndEligibleForBackupWithTransport(
- @Nullable TransportClient transportClient,
+ @Nullable TransportConnection transportConnection,
String packageName) {
return sAppsRunningAndEligibleForBackupWithTransport.contains(packageName);
}
diff --git a/services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java b/services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java
index fd51df7ab1f9..06b7fb7e6ae3 100644
--- a/services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java
+++ b/services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java
@@ -23,7 +23,7 @@ import com.android.server.backup.UserBackupManagerService;
import com.android.server.backup.internal.OnTaskFinishedListener;
import com.android.server.backup.keyvalue.KeyValueBackupReporter;
import com.android.server.backup.keyvalue.KeyValueBackupTask;
-import com.android.server.backup.transport.TransportClient;
+import com.android.server.backup.transport.TransportConnection;
import com.android.server.backup.utils.BackupEligibilityRules;
import org.robolectric.annotation.Implementation;
@@ -56,7 +56,7 @@ public class ShadowKeyValueBackupTask {
@Implementation
protected void __constructor__(
UserBackupManagerService backupManagerService,
- TransportClient transportClient,
+ TransportConnection transportConnection,
String transportDirName,
List<String> queue,
@Nullable DataChangedJournal dataChangedJournal,
diff --git a/services/robotests/src/com/android/server/testing/shadows/ShadowPerformUnifiedRestoreTask.java b/services/robotests/src/com/android/server/testing/shadows/ShadowPerformUnifiedRestoreTask.java
index 5161070398d7..71010a9fe935 100644
--- a/services/robotests/src/com/android/server/testing/shadows/ShadowPerformUnifiedRestoreTask.java
+++ b/services/robotests/src/com/android/server/testing/shadows/ShadowPerformUnifiedRestoreTask.java
@@ -24,15 +24,12 @@ import android.content.pm.PackageInfo;
import com.android.server.backup.UserBackupManagerService;
import com.android.server.backup.internal.OnTaskFinishedListener;
import com.android.server.backup.restore.PerformUnifiedRestoreTask;
-import com.android.server.backup.transport.TransportClient;
+import com.android.server.backup.transport.TransportConnection;
import com.android.server.backup.utils.BackupEligibilityRules;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
-import java.util.Map;
-import java.util.Set;
-
@Implements(PerformUnifiedRestoreTask.class)
public class ShadowPerformUnifiedRestoreTask {
@Nullable private static ShadowPerformUnifiedRestoreTask sLastShadow;
@@ -60,7 +57,7 @@ public class ShadowPerformUnifiedRestoreTask {
@Implementation
protected void __constructor__(
UserBackupManagerService backupManagerService,
- TransportClient transportClient,
+ TransportConnection transportConnection,
IRestoreObserver observer,
IBackupManagerMonitor monitor,
long restoreSetToken,