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

Commit 24d583df authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE on logContextCommitted()"

parents ec013122 996e03e5

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

+3 −3
Original line number Diff line number Diff line
@@ -715,14 +715,14 @@ final class AutofillManagerServiceImpl { 
            @Nullable ArrayList<String> changedDatasetIds,

            @Nullable ArrayList<AutofillId> manuallyFilledFieldIds,

            @Nullable ArrayList<ArrayList<String>> manuallyFilledDatasetIds,

            @NonNull ArrayList<AutofillId> detectedFieldIdsList,

            @NonNull ArrayList<Match> detectedMatchesList) {

            @Nullable ArrayList<AutofillId> detectedFieldIdsList,

            @Nullable ArrayList<Match> detectedMatchesList) {



        synchronized (mLock) {

            if (isValidEventLocked("logDatasetNotSelected()", sessionId)) {

                AutofillId[] detectedFieldsIds = null;

                Match[] detectedMatches = null;

                if (!detectedFieldIdsList.isEmpty()) {

                if (detectedFieldIdsList != null) {

                    detectedFieldsIds = new AutofillId[detectedFieldIdsList.size()];

                    detectedFieldIdsList.toArray(detectedFieldsIds);

                    detectedMatches = new Match[detectedMatchesList.size()];