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

Commit 92910d8b authored by Ruslan Tkhakokhov's avatar Ruslan Tkhakokhov Committed by Automerger Merge Worker
Browse files

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

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16343958

Change-Id: I6b74a1ff041cb3e06173bb86927997238d19a06e
parents ef253453 87921ea2

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

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

        }





        int operationType;

        int operationType;

        TransportClient transportClient = null;

        try {

        try {

            operationType = getOperationTypeFromTransport(

            transportClient = mTransportManager.getTransportClientOrThrow(

                    mTransportManager.getTransportClientOrThrow(transport, /* caller */

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

                            "BMS.beginRestoreSession"));

            operationType = getOperationTypeFromTransport(transportClient);

        } 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 (transportClient != null) {

                mTransportManager.disposeOfTransportClient(transportClient,

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

            }

        }

        }





        synchronized (this) {

        synchronized (this) {