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

Merge "Catch RemoteExceptions in DataShareCallbackDelegate" into rvc-dev am: 51715229f9

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

Change-Id: I7d111d191837f060cdb41c5c4d513008d2fbc982
This commit is contained in:
Yara Hassan
2020-06-19 15:57:43 +00:00
committed by Automerger Merge Worker
parent b5a4639c36 51715229f9
commit 64d87f381a
1 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -953,7 +953,7 @@ public final class ContentCaptureManagerService extends
} }
@Override @Override
public void accept(@NonNull IDataShareReadAdapter serviceAdapter) throws RemoteException { public void accept(@NonNull IDataShareReadAdapter serviceAdapter) {
Slog.i(TAG, "Data share request accepted by Content Capture service"); Slog.i(TAG, "Data share request accepted by Content Capture service");
logServiceEvent(CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__ACCEPT_DATA_SHARE_REQUEST); logServiceEvent(CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__ACCEPT_DATA_SHARE_REQUEST);
@@ -961,8 +961,8 @@ public final class ContentCaptureManagerService extends
if (clientPipe == null) { if (clientPipe == null) {
logServiceEvent( logServiceEvent(
CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__DATA_SHARE_ERROR_CLIENT_PIPE_FAIL); CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__DATA_SHARE_ERROR_CLIENT_PIPE_FAIL);
mClientAdapter.error(ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN); sendErrorSignal(mClientAdapter, serviceAdapter,
serviceAdapter.error(ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN); ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN);
return; return;
} }
@@ -975,8 +975,8 @@ public final class ContentCaptureManagerService extends
CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__DATA_SHARE_ERROR_SERVICE_PIPE_FAIL); CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__DATA_SHARE_ERROR_SERVICE_PIPE_FAIL);
bestEffortCloseFileDescriptors(sourceIn, sinkIn); bestEffortCloseFileDescriptors(sourceIn, sinkIn);
mClientAdapter.error(ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN); sendErrorSignal(mClientAdapter, serviceAdapter,
serviceAdapter.error(ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN); ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN);
return; return;
} }
@@ -985,8 +985,26 @@ public final class ContentCaptureManagerService extends
mParentService.mPackagesWithShareRequests.add(mDataShareRequest.getPackageName()); mParentService.mPackagesWithShareRequests.add(mDataShareRequest.getPackageName());
mClientAdapter.write(sourceIn); try {
serviceAdapter.start(sinkOut); 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;
}
try {
serviceAdapter.start(sinkOut);
} catch (RemoteException e) {
Slog.e(TAG, "Failed to call start() the service operation", e);
sendErrorSignal(mClientAdapter, serviceAdapter,
ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN);
logServiceEvent(
CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__DATA_SHARE_ERROR_SERVICE_PIPE_FAIL);
return;
}
// File descriptors received by remote apps will be copies of the current one. Close // File descriptors received by remote apps will be copies of the current one. Close
// the ones that belong to the system server, so there's only 1 open left for the // the ones that belong to the system server, so there's only 1 open left for the
@@ -1061,11 +1079,20 @@ public final class ContentCaptureManagerService extends
} }
@Override @Override
public void reject() throws RemoteException { public void reject() {
Slog.i(TAG, "Data share request rejected by Content Capture service"); Slog.i(TAG, "Data share request rejected by Content Capture service");
logServiceEvent(CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__REJECT_DATA_SHARE_REQUEST); logServiceEvent(CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__REJECT_DATA_SHARE_REQUEST);
mClientAdapter.rejected(); try {
mClientAdapter.rejected();
} catch (RemoteException e) {
Slog.w(TAG, "Failed to call rejected() the client operation", e);
try {
mClientAdapter.error(ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN);
} catch (RemoteException e2) {
Slog.w(TAG, "Failed to call error() the client operation", e2);
}
}
} }
private void enforceDataSharingTtl(ParcelFileDescriptor sourceIn, private void enforceDataSharingTtl(ParcelFileDescriptor sourceIn,