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

Commit b6b5a8c1 authored by Dan Willemsen's avatar Dan Willemsen Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 68b2b71f to... 

Merge "resolve merge conflicts of 68b2b71f to aosp-main-future" into aosp-main-future
parents 3fbb2f79 ff7aaf45

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