Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c496b7e authored by Dan Willemsen's avatar Dan Willemsen Committed by Sarp Misoglu
Browse files

resolve merge conflicts of 68b2b71f to aosp-main-future 

Test: Treehugger
Bug: 300093776
Change-Id: Ieff5045e236193f97857d9cd50faa190735d7894
(cherry picked from commit ff7aaf45)
parent dead0f9c

services/backup/java/com/android/server/backup/TransportManager.java

+3 −0
Original line number Diff line number Diff line
@@ -738,6 +738,9 @@ public class TransportManager { 
        try {

            String transportName = transport.name();

            String transportDirName = transport.transportDirName();

            if (transportName == null || transportDirName == null) {

                return BackupManager.ERROR_TRANSPORT_INVALID;

            }

            registerTransport(transportComponent, transport);

            // If registerTransport() hasn't thrown...

            Slog.d(TAG, addUserIdToLogMessage(mUserId, "Transport " + transportString