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 am: e917edaa09

Browse Source 
Change-Id: I52c17079f167223a75ac03ea5128d17424d44f4e
This commit is contained in:
Sergey Volnov
2020-04-09 23:15:31 +00:00
committed by Automerger Merge Worker
parent 415f2ea5d9 e917edaa09
commit ba7b0e67fe
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) {