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

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

Change-Id: I33cc7660367057f5cea9fd74878152e1750acacb
This commit is contained in:
Ruslan Tkhakokhov
2021-12-07 20:15:09 +00:00
committed by Automerger Merge Worker
parent 14e8d1ddfd fb7c9dfb81
commit 87921ea2d1
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; 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) {