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

Merge "Update language to comply with Android's inclusive language guidance" am: 2f9678b015 am: ba422d29e0 am: ff7f3b8bfe am: 505fcf9d0f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375857

Change-Id: I6470f7cc7bf76aea33b3f4e9e647ace3765153b7
This commit is contained in:
Treehugger Robot
2020-07-31 00:23:40 +00:00
committed by Automerger Merge Worker
parent 9729aa4f7b 505fcf9d0f
commit 353c4b1178
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/autofill/java/com/android/server/autofill/Session.java
View File

@@ -1710,7 +1710,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
if ((state & ViewState.STATE_AUTOFILLED_ONCE) != 0) { if ((state & ViewState.STATE_AUTOFILLED_ONCE) != 0) {
final String datasetId = viewState.getDatasetId(); final String datasetId = viewState.getDatasetId();
if (datasetId == null) { if (datasetId == null) {
// Sanity check - should never happen. // Validation check - should never happen.
Slog.w(TAG, "logContextCommitted(): no dataset id on " + viewState); Slog.w(TAG, "logContextCommitted(): no dataset id on " + viewState);
continue; continue;
} }
@@ -1844,7 +1844,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
final ArrayMap<String, String> algorithms = userData.getFieldClassificationAlgorithms(); final ArrayMap<String, String> algorithms = userData.getFieldClassificationAlgorithms();
final ArrayMap<String, Bundle> args = userData.getFieldClassificationArgs(); final ArrayMap<String, Bundle> args = userData.getFieldClassificationArgs();
// Sanity check // Validation check
if (userValues == null || categoryIds == null || userValues.length != categoryIds.length) { if (userValues == null || categoryIds == null || userValues.length != categoryIds.length) {
final int valuesLength = userValues == null ? -1 : userValues.length; final int valuesLength = userValues == null ? -1 : userValues.length;
final int idsLength = categoryIds == null ? -1 : categoryIds.length; final int idsLength = categoryIds == null ? -1 : categoryIds.length;
@@ -2668,12 +2668,12 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
final String currentUrl = mUrlBar == null ? null final String currentUrl = mUrlBar == null ? null
: mUrlBar.getText().toString().trim(); : mUrlBar.getText().toString().trim();
if (currentUrl == null) { if (currentUrl == null) {
// Sanity check - shouldn't happen. // Validation check - shouldn't happen.
wtf(null, "URL bar value changed, but current value is null"); wtf(null, "URL bar value changed, but current value is null");
return; return;
} }
if (value == null || ! value.isText()) { if (value == null || ! value.isText()) {
// Sanity check - shouldn't happen. // Validation check - shouldn't happen.
wtf(null, "URL bar value changed to null or non-text: %s", value); wtf(null, "URL bar value changed to null or non-text: %s", value);
return; return;
} }