From b85b36ac09813172e73a8bdf594bd077139a3a6f Mon Sep 17 00:00:00 2001 From: nathch Date: Sat, 21 Sep 2019 22:06:40 +0100 Subject: [PATCH] Move transport client code into its own lib We will route backup through the BackupEncryption APK which will implement an intermediate transport which will encrypt (or decrypt) the data when sending it (receiving it) from the real transport. Since both backup services and IntermediateTransport need to bind to IBackupTransport, they both need the transport client code so we move that into its own lib. Bug: 139269919 Test: atest -v RunBackupFrameworksServicesRoboTests Test: atest -v $(find frameworks/base/services/tests/servicestests/src/com/android/server/backup -name '\''*Test.java'\'')' Test: atest -v CtsBackupTestCases CtsBackupHostTestCases Change-Id: Id986162ac71adf8638e5797169ef70e0d3d58b0c --- services/backup/Android.bp | 1 + services/backup/backuplib/Android.bp | 5 +++++ .../java/com/android/server/backup/TransportManager.java | 0 .../backup/transport/OnTransportRegisteredListener.java | 0 .../com/android/server/backup/transport/TransportClient.java | 0 .../server/backup/transport/TransportClientManager.java | 0 .../server/backup/transport/TransportConnectionListener.java | 0 .../backup/transport/TransportNotAvailableException.java | 0 .../backup/transport/TransportNotRegisteredException.java | 0 .../com/android/server/backup/transport/TransportStats.java | 0 .../com/android/server/backup/transport/TransportUtils.java | 0 11 files changed, 6 insertions(+) create mode 100644 services/backup/backuplib/Android.bp rename services/backup/{ => backuplib}/java/com/android/server/backup/TransportManager.java (100%) rename services/backup/{ => backuplib}/java/com/android/server/backup/transport/OnTransportRegisteredListener.java (100%) rename services/backup/{ => backuplib}/java/com/android/server/backup/transport/TransportClient.java (100%) rename services/backup/{ => backuplib}/java/com/android/server/backup/transport/TransportClientManager.java (100%) rename services/backup/{ => backuplib}/java/com/android/server/backup/transport/TransportConnectionListener.java (100%) rename services/backup/{ => backuplib}/java/com/android/server/backup/transport/TransportNotAvailableException.java (100%) rename services/backup/{ => backuplib}/java/com/android/server/backup/transport/TransportNotRegisteredException.java (100%) rename services/backup/{ => backuplib}/java/com/android/server/backup/transport/TransportStats.java (100%) rename services/backup/{ => backuplib}/java/com/android/server/backup/transport/TransportUtils.java (100%) diff --git a/services/backup/Android.bp b/services/backup/Android.bp index ef03d83d4916d..a3b0c891d00a9 100644 --- a/services/backup/Android.bp +++ b/services/backup/Android.bp @@ -2,4 +2,5 @@ java_library_static { name: "services.backup", srcs: ["java/**/*.java"], libs: ["services.core"], + static_libs: ["backuplib"], } diff --git a/services/backup/backuplib/Android.bp b/services/backup/backuplib/Android.bp new file mode 100644 index 0000000000000..7b194a0923c2f --- /dev/null +++ b/services/backup/backuplib/Android.bp @@ -0,0 +1,5 @@ +java_library { + name: "backuplib", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/backup/java/com/android/server/backup/TransportManager.java b/services/backup/backuplib/java/com/android/server/backup/TransportManager.java similarity index 100% rename from services/backup/java/com/android/server/backup/TransportManager.java rename to services/backup/backuplib/java/com/android/server/backup/TransportManager.java diff --git a/services/backup/java/com/android/server/backup/transport/OnTransportRegisteredListener.java b/services/backup/backuplib/java/com/android/server/backup/transport/OnTransportRegisteredListener.java similarity index 100% rename from services/backup/java/com/android/server/backup/transport/OnTransportRegisteredListener.java rename to services/backup/backuplib/java/com/android/server/backup/transport/OnTransportRegisteredListener.java diff --git a/services/backup/java/com/android/server/backup/transport/TransportClient.java b/services/backup/backuplib/java/com/android/server/backup/transport/TransportClient.java similarity index 100% rename from services/backup/java/com/android/server/backup/transport/TransportClient.java rename to services/backup/backuplib/java/com/android/server/backup/transport/TransportClient.java diff --git a/services/backup/java/com/android/server/backup/transport/TransportClientManager.java b/services/backup/backuplib/java/com/android/server/backup/transport/TransportClientManager.java similarity index 100% rename from services/backup/java/com/android/server/backup/transport/TransportClientManager.java rename to services/backup/backuplib/java/com/android/server/backup/transport/TransportClientManager.java diff --git a/services/backup/java/com/android/server/backup/transport/TransportConnectionListener.java b/services/backup/backuplib/java/com/android/server/backup/transport/TransportConnectionListener.java similarity index 100% rename from services/backup/java/com/android/server/backup/transport/TransportConnectionListener.java rename to services/backup/backuplib/java/com/android/server/backup/transport/TransportConnectionListener.java diff --git a/services/backup/java/com/android/server/backup/transport/TransportNotAvailableException.java b/services/backup/backuplib/java/com/android/server/backup/transport/TransportNotAvailableException.java similarity index 100% rename from services/backup/java/com/android/server/backup/transport/TransportNotAvailableException.java rename to services/backup/backuplib/java/com/android/server/backup/transport/TransportNotAvailableException.java diff --git a/services/backup/java/com/android/server/backup/transport/TransportNotRegisteredException.java b/services/backup/backuplib/java/com/android/server/backup/transport/TransportNotRegisteredException.java similarity index 100% rename from services/backup/java/com/android/server/backup/transport/TransportNotRegisteredException.java rename to services/backup/backuplib/java/com/android/server/backup/transport/TransportNotRegisteredException.java diff --git a/services/backup/java/com/android/server/backup/transport/TransportStats.java b/services/backup/backuplib/java/com/android/server/backup/transport/TransportStats.java similarity index 100% rename from services/backup/java/com/android/server/backup/transport/TransportStats.java rename to services/backup/backuplib/java/com/android/server/backup/transport/TransportStats.java diff --git a/services/backup/java/com/android/server/backup/transport/TransportUtils.java b/services/backup/backuplib/java/com/android/server/backup/transport/TransportUtils.java similarity index 100% rename from services/backup/java/com/android/server/backup/transport/TransportUtils.java rename to services/backup/backuplib/java/com/android/server/backup/transport/TransportUtils.java