Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff7f3b8b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: 2f9678b0 am: ba422d29

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

Change-Id: I38145552ef5364e488946e4cf71d70beaf25217f
parents 2863f04c ba422d29

services/autofill/java/com/android/server/autofill/Session.java

+4 −4
Original line number Diff line number Diff line
@@ -1710,7 +1710,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                if ((state & ViewState.STATE_AUTOFILLED_ONCE) != 0) {

                    final String datasetId = viewState.getDatasetId();

                    if (datasetId == null) {

                        // Sanity check - should never happen.

                        // Validation check - should never happen.

                        Slog.w(TAG, "logContextCommitted(): no dataset id on " + viewState);

                        continue;

                    }
@@ -1844,7 +1844,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
        final ArrayMap<String, String> algorithms = userData.getFieldClassificationAlgorithms();

        final ArrayMap<String, Bundle> args = userData.getFieldClassificationArgs();



        // Sanity check

        // Validation check

        if (userValues == null || categoryIds == null || userValues.length != categoryIds.length) {

            final int valuesLength = userValues == null ? -1 : userValues.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

                            : mUrlBar.getText().toString().trim();

                    if (currentUrl == null) {

                        // Sanity check - shouldn't happen.

                        // Validation check - shouldn't happen.

                        wtf(null, "URL bar value changed, but current value is null");

                        return;

                    }

                    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);

                        return;

                    }