Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf146dfa authored by Yara Hassan's avatar Yara Hassan Committed by Ahaan Ugale
Browse files

Handle sender's crash in Data Share API 

Implement IBinder.DeathRecipient in DataShareCallbackDelegate to listen
to the client's death and send an error to the CC service.

Test: CTS test
Bug: 157141129
Fixes: 157141129
Change-Id: I30f08f8ed741988ebcf585d74168d4dda03663a8
parent dc699fb8

services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java

+20 −1
Original line number Diff line number Diff line
@@ -930,7 +930,7 @@ public final class ContentCaptureManagerService extends 
        }



        @Override

        public void accept(IDataShareReadAdapter serviceAdapter) throws RemoteException {

        public void accept(@NonNull IDataShareReadAdapter serviceAdapter) throws RemoteException {

            Slog.i(TAG, "Data share request accepted by Content Capture service");



            Pair<ParcelFileDescriptor, ParcelFileDescriptor> clientPipe = createPipe();
@@ -967,6 +967,7 @@ public final class ContentCaptureManagerService extends 
            bestEffortCloseFileDescriptors(sourceIn, sinkOut);



            mParentService.mDataShareExecutor.execute(() -> {

                boolean receivedData = false;

                try (InputStream fis =

                             new ParcelFileDescriptor.AutoCloseInputStream(sinkIn);

                     OutputStream fos =
@@ -981,6 +982,8 @@ public final class ContentCaptureManagerService extends 
                        }



                        fos.write(byteBuffer, 0 /* offset */, readBytes);



                        receivedData = true;

                    }

                } catch (IOException e) {

                    Slog.e(TAG, "Failed to pipe client and service streams", e);
@@ -992,6 +995,22 @@ public final class ContentCaptureManagerService extends 
                        mParentService.mPackagesWithShareRequests

                                .remove(mDataShareRequest.getPackageName());

                    }

                    if (receivedData) {

                        try {

                            mClientAdapter.finish();

                        } catch (RemoteException e) {

                            Slog.e(TAG, "Failed to call finish() the client operation", e);

                        }

                        try {

                            serviceAdapter.finish();

                        } catch (RemoteException e) {

                            Slog.e(TAG, "Failed to call finish() the service operation", e);

                        }

                    } else {

                        // Client or service may have crashed before sending.

                        sendErrorSignal(mClientAdapter, serviceAdapter,

                                ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN);

                    }

                }

            });