Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I6b74a1ff041cb3e06173bb86927997238d19a06e
This commit is contained in:
Ruslan Tkhakokhov
2021-12-07 20:34:22 +00:00
committed by Automerger Merge Worker
parent ef253453f2 87921ea2d1
commit 92910d8bdb
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/backup/java/com/android/server/backup/UserBackupManagerService.java
View File

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