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

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

Merge "Dispose of TransportClient in BMS#beginRestoreSession" into sc-v2-dev

parents c7186b08 4428e22d

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

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



        int operationType;

        TransportClient transportClient = null;

        try {

            operationType = getOperationTypeFromTransport(

                    mTransportManager.getTransportClientOrThrow(transport, /* caller */

                            "BMS.beginRestoreSession"));

            transportClient = mTransportManager.getTransportClientOrThrow(

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

            operationType = getOperationTypeFromTransport(transportClient);

        } catch (TransportNotAvailableException | TransportNotRegisteredException

                | RemoteException e) {

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

            return null;

        } finally {

            if (transportClient != null) {

                mTransportManager.disposeOfTransportClient(transportClient,

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

            }

        }



        synchronized (this) {