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

Commit 17eb927b authored by Ruslan Tkhakokhov's avatar Ruslan Tkhakokhov Committed by Android (Google) Code Review
Browse files

Merge "Dispose of TransportClient in BMS#beginRestoreSession"

parents d88b35d6 a95214a4

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

+9 −3
Original line number Original line Diff line number Diff line
@@ -3907,14 +3907,20 @@ public class UserBackupManagerService { 
        }

        }





        int operationType;

        int operationType;

        TransportConnection transportConnection = null;

        try {

        try {

            operationType = getOperationTypeFromTransport(

            transportConnection = mTransportManager.getTransportClientOrThrow(

                    mTransportManager.getTransportClientOrThrow(transport, /* caller */

                    transport, /* caller */"BMS.beginRestoreSession");

                            "BMS.beginRestoreSession"));

            operationType = getOperationTypeFromTransport(transportConnection);

        } catch (TransportNotAvailableException | TransportNotRegisteredException

        } catch (TransportNotAvailableException | TransportNotRegisteredException

                | RemoteException e) {

                | RemoteException e) {

            Slog.w(TAG, "Failed to get operation type from transport: " + e);

            Slog.w(TAG, "Failed to get operation type from transport: " + e);

            return null;

            return null;

        } finally {

            if (transportConnection != null) {

                mTransportManager.disposeOfTransportClient(transportConnection,

                        /* caller */"BMS.beginRestoreSession");

            }

        }

        }





        synchronized (this) {

        synchronized (this) {