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

Ensure we clear mPackagesWithShareRequests when a remote exception

Browse Source 
happens at write() or start().

Bug: 203784652
Test: atest CtsContentCaptureServiceTestCases
Change-Id: I35d8c8056dc126c44f03b74a04090861224a9407
(cherry picked from commit 39d8062aec)
This commit is contained in:
Sergey Volnov
2021-10-26 19:10:58 +01:00
parent 8a7e825938
commit 063fe636ba
1 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java
View File

@@ -1072,26 +1072,18 @@ public final class ContentCaptureManagerService extends
ParcelFileDescriptor sourceOut = servicePipe.second;
ParcelFileDescriptor sinkOut = servicePipe.first;
mParentService.mPackagesWithShareRequests.add(mDataShareRequest.getPackageName());
try {
mClientAdapter.write(sourceIn);
} catch (RemoteException e) {
Slog.e(TAG, "Failed to call write() the client operation", e);
sendErrorSignal(mClientAdapter, serviceAdapter,
ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN);
logServiceEvent(
CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__DATA_SHARE_ERROR_CLIENT_PIPE_FAIL);
return;
synchronized (mParentService.mLock) {
mParentService.mPackagesWithShareRequests.add(mDataShareRequest.getPackageName());
}
try {
serviceAdapter.start(sinkOut);
} catch (RemoteException e) {
Slog.e(TAG, "Failed to call start() the service operation", e);
if (!setUpSharingPipeline(mClientAdapter, serviceAdapter, sourceIn, sinkOut)) {
sendErrorSignal(mClientAdapter, serviceAdapter,
ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN);
logServiceEvent(
CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__DATA_SHARE_ERROR_SERVICE_PIPE_FAIL);
bestEffortCloseFileDescriptors(sourceIn, sinkIn, sourceOut, sinkOut);
synchronized (mParentService.mLock) {
mParentService.mPackagesWithShareRequests
.remove(mDataShareRequest.getPackageName());
}
return;
}
@@ -1184,6 +1176,32 @@ public final class ContentCaptureManagerService extends
}
}
private boolean setUpSharingPipeline(
IDataShareWriteAdapter clientAdapter,
IDataShareReadAdapter serviceAdapter,
ParcelFileDescriptor sourceIn,
ParcelFileDescriptor sinkOut) {
try {
clientAdapter.write(sourceIn);
} catch (RemoteException e) {
Slog.e(TAG, "Failed to call write() the client operation", e);
logServiceEvent(
CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__DATA_SHARE_ERROR_CLIENT_PIPE_FAIL);
return false;
}
try {
serviceAdapter.start(sinkOut);
} catch (RemoteException e) {
Slog.e(TAG, "Failed to call start() the service operation", e);
logServiceEvent(
CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__DATA_SHARE_ERROR_SERVICE_PIPE_FAIL);
return false;
}
return true;
}
private void enforceDataSharingTtl(ParcelFileDescriptor sourceIn,
ParcelFileDescriptor sinkIn,
ParcelFileDescriptor sourceOut,