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

Commit 2d514581 authored by Sergey Volnov's avatar Sergey Volnov Committed by Automerger Merge Worker
Browse files

Merge "Fix Content Capture Data Share" into rvc-dev am: 51ecd453 am: 520aa4ce am: 025333fc 

Change-Id: I2f766738ce55d8ad5e6efb2be63301f9c7c02c1e
parents 70098453 025333fc

core/java/android/service/contentcapture/ContentCaptureService.java

+1 −1
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ public abstract class ContentCaptureService extends Service { 
        void initializeForDelegate(DataShareReadAdapterDelegate delegate,

                DataShareReadAdapter adapter, Executor executor) {

            mDataShareReadAdapterHardReferences.put(delegate, adapter);

            mExecutorHardReferences.remove(delegate, executor);

            mExecutorHardReferences.put(delegate, executor);

        }



        Executor getExecutor(DataShareReadAdapterDelegate delegate) {

core/java/android/view/contentcapture/ContentCaptureManager.java

+1 −1
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ public final class ContentCaptureManager { 
        void initializeForDelegate(DataShareAdapterDelegate delegate, DataShareWriteAdapter adapter,

                Executor executor) {

            mWriteAdapterHardReferences.put(delegate, adapter);

            mExecutorHardReferences.remove(delegate, executor);

            mExecutorHardReferences.put(delegate, executor);

        }



        Executor getExecutor(DataShareAdapterDelegate delegate) {