From 7084974c2cec88e53d17e64fc79ce751af9297cc Mon Sep 17 00:00:00 2001
From: Ruslan Tkhakokhov <rthakohov@google.com>
Date: Tue, 7 Dec 2021 21:10:03 +0000
Subject: [PATCH] Revert "Merge "Dispose of TransportClient in
 BMS#beginRestoreSession" into sc-v2-dev am: fb7c9dfb81 am: 87921ea2d1"

This reverts commit 92910d8bdb8e4856a3ebc03772ddc262ce682717.

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

Change-Id: Ieb054a4ee0670008248aa8b7d47c43ac51b526b5
---
 .../server/backup/UserBackupManagerService.java      | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/services/backup/java/com/android/server/backup/UserBackupManagerService.java b/services/backup/java/com/android/server/backup/UserBackupManagerService.java
index 81b9442a0126b..452adb2945404 100644
--- a/services/backup/java/com/android/server/backup/UserBackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/UserBackupManagerService.java
@@ -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) {