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

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

Browse Source
This commit is contained in:
Ruslan Tkhakokhov
2021-12-07 21:14:04 +00:00
committed by Android (Google) Code Review
parent 53edfd6f3e 7084974c2c
commit 63e768450f
1 changed files with 3 additions and 9 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,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) {