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

Merge "Fix Content Capture Data Share" into rvc-dev am: 51ecd453b3 am: 520aa4ce18

Browse Source 
Change-Id: If078ea5994e025c97e2a7eb3556e540b89fe1599
This commit is contained in:
Sergey Volnov
2020-04-09 22:52:27 +00:00
committed by Automerger Merge Worker
parent 2616c88965 520aa4ce18
commit e917edaa09
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/service/contentcapture/ContentCaptureService.java
View File

@@ -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) {

2
core/java/android/view/contentcapture/ContentCaptureManager.java
View File

@@ -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) {