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

Commit 7084974c authored by Ruslan Tkhakokhov's avatar Ruslan Tkhakokhov
Browse files

Revert "Merge "Dispose of TransportClient in BMS#beginRestoreSession" into... 

Revert "Merge "Dispose of TransportClient in BMS#beginRestoreSession" into sc-v2-dev am: fb7c9dfb am: 87921ea2"

This reverts commit 92910d8b.

Reason for revert: Breaking the build due to a conflict with ag/16338778

Change-Id: Ieb054a4ee0670008248aa8b7d47c43ac51b526b5
parent 92910d8b

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

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



        int operationType;

        TransportClient transportClient = null;

        try {

            transportClient = mTransportManager.getTransportClientOrThrow(

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

            operationType = getOperationTypeFromTransport(transportClient);

            operationType = getOperationTypeFromTransport(

                    mTransportManager.getTransportClientOrThrow(transport, /* caller */

                            "BMS.beginRestoreSession"));

        } 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) {