From b6faae9f7d1a9af3a4c548c5e01f72a53d1404ea Mon Sep 17 00:00:00 2001 From: Sarp Misoglu Date: Thu, 15 Sep 2022 13:37:53 +0100 Subject: [PATCH] Move transport client code back to the main target In ag/9433204 this code was separated into its own library for a feature that was cancelled. It doesn't make sense to keep it separate anymore. Test: m atest BackupTransportClientTest.java atest CtsBackupHostTestCases Bug: 210083465 Change-Id: I6b5a6bb45563c16b359f0281aac2c28bce03a6fd --- services/backup/Android.bp | 2 +- services/backup/backuplib/Android.bp | 21 ------------------- .../server/backup/TransportManager.java | 0 .../transport/BackupTransportClient.java | 4 ++-- .../OnTransportRegisteredListener.java | 0 .../backup/transport/TransportConnection.java | 0 .../TransportConnectionListener.java | 6 ++---- .../transport/TransportConnectionManager.java | 0 .../TransportNotAvailableException.java | 0 .../TransportNotRegisteredException.java | 0 .../backup/transport/TransportStats.java | 0 .../transport/TransportStatusCallback.java | 2 +- .../backup/transport/TransportUtils.java | 0 .../transport/BackupTransportClientTest.java | 1 - 14 files changed, 6 insertions(+), 30 deletions(-) delete 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/BackupTransportClient.java (99%) rename services/backup/{backuplib => }/java/com/android/server/backup/transport/OnTransportRegisteredListener.java (100%) rename services/backup/{backuplib => }/java/com/android/server/backup/transport/TransportConnection.java (100%) rename services/backup/{backuplib => }/java/com/android/server/backup/transport/TransportConnectionListener.java (89%) rename services/backup/{backuplib => }/java/com/android/server/backup/transport/TransportConnectionManager.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/TransportStatusCallback.java (98%) 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 ead8aff30147f..b086406a2ad58 100644 --- a/services/backup/Android.bp +++ b/services/backup/Android.bp @@ -19,5 +19,5 @@ java_library_static { defaults: ["platform_service_defaults"], srcs: [":services.backup-sources"], libs: ["services.core"], - static_libs: ["backuplib", "app-compat-annotations"], + static_libs: ["app-compat-annotations"], } diff --git a/services/backup/backuplib/Android.bp b/services/backup/backuplib/Android.bp deleted file mode 100644 index 5a28891f88c94..0000000000000 --- a/services/backup/backuplib/Android.bp +++ /dev/null @@ -1,21 +0,0 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_base_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["frameworks_base_license"], -} - -filegroup { - name: "backuplib-sources", - srcs: ["java/**/*.java"], - path: "java", - visibility: ["//frameworks/base/services"], -} - -java_library { - name: "backuplib", - srcs: [":backuplib-sources"], - libs: ["services.core"], -} diff --git a/services/backup/backuplib/java/com/android/server/backup/TransportManager.java b/services/backup/java/com/android/server/backup/TransportManager.java similarity index 100% rename from services/backup/backuplib/java/com/android/server/backup/TransportManager.java rename to services/backup/java/com/android/server/backup/TransportManager.java diff --git a/services/backup/backuplib/java/com/android/server/backup/transport/BackupTransportClient.java b/services/backup/java/com/android/server/backup/transport/BackupTransportClient.java similarity index 99% rename from services/backup/backuplib/java/com/android/server/backup/transport/BackupTransportClient.java rename to services/backup/java/com/android/server/backup/transport/BackupTransportClient.java index d75d6484bec31..237a3faf220ea 100644 --- a/services/backup/backuplib/java/com/android/server/backup/transport/BackupTransportClient.java +++ b/services/backup/java/com/android/server/backup/transport/BackupTransportClient.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 The Android Open Source Project + * Copyright (C) 2022 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -376,7 +376,7 @@ public class BackupTransportClient { try { return future.get(600, TimeUnit.SECONDS); } catch (InterruptedException | ExecutionException | TimeoutException - | CancellationException e) { + | CancellationException e) { Slog.w(TAG, "Failed to get result from transport:", e); return null; } finally { diff --git a/services/backup/backuplib/java/com/android/server/backup/transport/OnTransportRegisteredListener.java b/services/backup/java/com/android/server/backup/transport/OnTransportRegisteredListener.java similarity index 100% rename from services/backup/backuplib/java/com/android/server/backup/transport/OnTransportRegisteredListener.java rename to services/backup/java/com/android/server/backup/transport/OnTransportRegisteredListener.java diff --git a/services/backup/backuplib/java/com/android/server/backup/transport/TransportConnection.java b/services/backup/java/com/android/server/backup/transport/TransportConnection.java similarity index 100% rename from services/backup/backuplib/java/com/android/server/backup/transport/TransportConnection.java rename to services/backup/java/com/android/server/backup/transport/TransportConnection.java diff --git a/services/backup/backuplib/java/com/android/server/backup/transport/TransportConnectionListener.java b/services/backup/java/com/android/server/backup/transport/TransportConnectionListener.java similarity index 89% rename from services/backup/backuplib/java/com/android/server/backup/transport/TransportConnectionListener.java rename to services/backup/java/com/android/server/backup/transport/TransportConnectionListener.java index 1776c4104e26c..b218a29c13bd3 100644 --- a/services/backup/backuplib/java/com/android/server/backup/transport/TransportConnectionListener.java +++ b/services/backup/java/com/android/server/backup/transport/TransportConnectionListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 The Android Open Source Project + * Copyright (C) 2022 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -11,15 +11,13 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License + * limitations under the License. */ package com.android.server.backup.transport; import android.annotation.Nullable; -import com.android.server.backup.transport.BackupTransportClient; - /** * Listener to be called by {@link TransportConnection#connectAsync(TransportConnectionListener, * String)}. diff --git a/services/backup/backuplib/java/com/android/server/backup/transport/TransportConnectionManager.java b/services/backup/java/com/android/server/backup/transport/TransportConnectionManager.java similarity index 100% rename from services/backup/backuplib/java/com/android/server/backup/transport/TransportConnectionManager.java rename to services/backup/java/com/android/server/backup/transport/TransportConnectionManager.java diff --git a/services/backup/backuplib/java/com/android/server/backup/transport/TransportNotAvailableException.java b/services/backup/java/com/android/server/backup/transport/TransportNotAvailableException.java similarity index 100% rename from services/backup/backuplib/java/com/android/server/backup/transport/TransportNotAvailableException.java rename to services/backup/java/com/android/server/backup/transport/TransportNotAvailableException.java diff --git a/services/backup/backuplib/java/com/android/server/backup/transport/TransportNotRegisteredException.java b/services/backup/java/com/android/server/backup/transport/TransportNotRegisteredException.java similarity index 100% rename from services/backup/backuplib/java/com/android/server/backup/transport/TransportNotRegisteredException.java rename to services/backup/java/com/android/server/backup/transport/TransportNotRegisteredException.java diff --git a/services/backup/backuplib/java/com/android/server/backup/transport/TransportStats.java b/services/backup/java/com/android/server/backup/transport/TransportStats.java similarity index 100% rename from services/backup/backuplib/java/com/android/server/backup/transport/TransportStats.java rename to services/backup/java/com/android/server/backup/transport/TransportStats.java diff --git a/services/backup/backuplib/java/com/android/server/backup/transport/TransportStatusCallback.java b/services/backup/java/com/android/server/backup/transport/TransportStatusCallback.java similarity index 98% rename from services/backup/backuplib/java/com/android/server/backup/transport/TransportStatusCallback.java rename to services/backup/java/com/android/server/backup/transport/TransportStatusCallback.java index 99526b7ef0d19..fb98825f13438 100644 --- a/services/backup/backuplib/java/com/android/server/backup/transport/TransportStatusCallback.java +++ b/services/backup/java/com/android/server/backup/transport/TransportStatusCallback.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 The Android Open Source Project + * Copyright (C) 2022 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/services/backup/backuplib/java/com/android/server/backup/transport/TransportUtils.java b/services/backup/java/com/android/server/backup/transport/TransportUtils.java similarity index 100% rename from services/backup/backuplib/java/com/android/server/backup/transport/TransportUtils.java rename to services/backup/java/com/android/server/backup/transport/TransportUtils.java diff --git a/services/tests/servicestests/src/com/android/server/backup/transport/BackupTransportClientTest.java b/services/tests/servicestests/src/com/android/server/backup/transport/BackupTransportClientTest.java index 1171518130cc0..581a2a71a9b64 100644 --- a/services/tests/servicestests/src/com/android/server/backup/transport/BackupTransportClientTest.java +++ b/services/tests/servicestests/src/com/android/server/backup/transport/BackupTransportClientTest.java @@ -41,7 +41,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import java.util.List; -import java.util.concurrent.CancellationException; @Presubmit @RunWith(AndroidJUnit4.class)