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

Fixed Cancellation for PendingAutofillRequest.

Browse Source 
1. mCallback.cancel() now correctly cancels the pending request.
2. AutofillProxy.update() now updates the CancellationSignal.

Fixes: 132459064
Test: atest android.autofillservice.cts.augmented
Change-Id: If8b2ab5c0fd8db4cfad440bf47031f6d85c28ae5
(cherry picked from commit 33bbf2aa2f1e5dabce5bd94e9b1c950cdcda1448)
This commit is contained in:
Adam He
2019-05-13 16:43:39 -07:00
parent ec5ded1113
commit 1d320ec6b1
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/service/autofill/augmented/AugmentedAutofillService.java
View File

@@ -228,7 +228,7 @@ public abstract class AugmentedAutofillService extends Service {
} else { } else {
// TODO(b/123099468): figure out if it's ok to reuse the proxy; add logging // TODO(b/123099468): figure out if it's ok to reuse the proxy; add logging
if (sDebug) Log.d(TAG, "Reusing proxy for session " + sessionId); if (sDebug) Log.d(TAG, "Reusing proxy for session " + sessionId);
proxy.update(focusedId, focusedValue, callback); proxy.update(focusedId, focusedValue, callback, cancellationSignal);
} }
try { try {
@@ -252,6 +252,15 @@ public abstract class AugmentedAutofillService extends Service {
Log.w(TAG, "No proxy for session " + sessionId); Log.w(TAG, "No proxy for session " + sessionId);
return; return;
} }
if (proxy.mCallback != null) {
try {
if (!proxy.mCallback.isCompleted()) {
proxy.mCallback.cancel();
}
} catch (Exception e) {
Log.e(TAG, "failed to check current pending request status", e);
}
}
proxy.destroy(); proxy.destroy();
} }
mAutofillProxies.clear(); mAutofillProxies.clear();
@@ -442,7 +451,7 @@ public abstract class AugmentedAutofillService extends Service {
} }
private void update(@NonNull AutofillId focusedId, @NonNull AutofillValue focusedValue, private void update(@NonNull AutofillId focusedId, @NonNull AutofillValue focusedValue,
@NonNull IFillCallback callback) { @NonNull IFillCallback callback, @NonNull CancellationSignal cancellationSignal) {
synchronized (mLock) { synchronized (mLock) {
mFocusedId = focusedId; mFocusedId = focusedId;
mFocusedValue = focusedValue; mFocusedValue = focusedValue;
@@ -457,6 +466,7 @@ public abstract class AugmentedAutofillService extends Service {
Log.d(TAG, "mCallback is updated."); Log.d(TAG, "mCallback is updated.");
} }
mCallback = callback; mCallback = callback;
mCancellationSignal = cancellationSignal;
} }
} }