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

Merge "Fix the validation for showing inline suggestion in webview" into rvc-dev am: 555ae029b2 am: 53028a731d

Browse Source 
Change-Id: I7220605885b228186dd3ac534cd37138aa508acb
This commit is contained in:
TreeHugger Robot
2020-03-25 07:14:50 +00:00
committed by Automerger Merge Worker
parent 5812666897 53028a731d
commit 1ef2520528
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/inputmethodservice/InlineSuggestionSession.java
View File

@@ -166,9 +166,14 @@ class InlineSuggestionSession {
}
return;
}
// The IME doesn't have information about the virtual view id for the child views in the
// web view, so we are only comparing the parent view id here. This means that for cases
// where there are two input fields in the web view, they will have the same view id
// (although different virtual child id), and we will not be able to distinguish them.
final AutofillId imeClientFieldId = mClientAutofillIdSupplier.get();
if (!mComponentName.getPackageName().equals(mClientPackageNameSupplier.get())
|| !fieldId.equalsIgnoreSession(mClientAutofillIdSupplier.get())) {
|| imeClientFieldId == null
|| fieldId.getViewId() != imeClientFieldId.getViewId()) {
if (DEBUG) {
Log.d(TAG,
"handleOnInlineSuggestionsResponse() called on the wrong package/field "

5
services/autofill/java/com/android/server/autofill/InlineSuggestionSession.java
View File

@@ -199,7 +199,10 @@ final class InlineSuggestionSession {
return false;
}
if (!mImeInputViewStarted || !autofillId.equalsIgnoreSession(mImeFieldId)) {
// TODO(b/151846600): IME doesn't have access to the virtual id of the webview, so we
// only compare the view id for now.
if (!mImeInputViewStarted || mImeFieldId == null
|| autofillId.getViewId() != mImeFieldId.getViewId()) {
if (sDebug) {
Log.d(TAG,
"onInlineSuggestionsResponseLocked not sent because input view is not "