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

Commit 49e96960 authored by Felipe Leme's avatar Felipe Leme
Browse files

Fixed NPE on dump() and other minor fixes... 

Bug: 36871500
Test: manual verification
Change-Id: I1c3a8406344280da37b728eae56f26447c48e0b2
parent f9db6d3b

core/java/android/view/autofill/AutofillManager.java

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public final class AutofillManager { 
     * android.service.autofill.FillCallback#onSuccess(android.service.autofill.FillResponse)} with

     * a {@code FillResponse} that requires authentication, the Intent that launches the

     * service authentication will contain the Bundle set by

     * {@link android.service.autofill.FillResponse.Builder#setExtras(Bundle)} on this extra.

     * {@link android.service.autofill.FillResponse.Builder#setClientState(Bundle)} on this extra.

     *

     * <p>

     * Type: {@link android.os.Bundle}
@@ -107,7 +107,7 @@ public final class AutofillManager { 
     *

     * @deprecated Use {@link android.service.autofill.FillRequest#FLAG_MANUAL_REQUEST}

     */

    // TODO(b/33197203): remove

    // TODO(b/33197203): remove (and change value of private flags)

    @Deprecated

    public static final int FLAG_MANUAL_REQUEST = 0x1;

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

+9 −9
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import android.provider.Settings; 
import android.service.autofill.AutofillService;

import android.service.autofill.AutofillServiceInfo;

import android.service.autofill.FillEventHistory;

import android.service.autofill.FillEventHistory.Event;

import android.service.autofill.FillRequest;

import android.service.autofill.FillResponse;

import android.service.autofill.IAutoFillService;
@@ -521,8 +522,7 @@ final class AutofillManagerServiceImpl { 
     */

    void setAuthenticationSelected() {

        synchronized (mLock) {

            mEventHistory.addEvent(

                    new FillEventHistory.Event(FillEventHistory.Event.TYPE_AUTHENTICATION_SELECTED, null));

            mEventHistory.addEvent(new Event(Event.TYPE_AUTHENTICATION_SELECTED, null));

        }

    }
@@ -531,8 +531,8 @@ final class AutofillManagerServiceImpl { 
     */

    void setDatasetAuthenticationSelected(@Nullable String selectedDataset) {

        synchronized (mLock) {

            mEventHistory.addEvent(new FillEventHistory.Event(

                    FillEventHistory.Event.TYPE_DATASET_AUTHENTICATION_SELECTED, selectedDataset));

            mEventHistory.addEvent(

                    new Event(Event.TYPE_DATASET_AUTHENTICATION_SELECTED, selectedDataset));

        }

    }
@@ -541,7 +541,7 @@ final class AutofillManagerServiceImpl { 
     */

    void setSaveShown() {

        synchronized (mLock) {

            mEventHistory.addEvent(new FillEventHistory.Event(FillEventHistory.Event.TYPE_SAVE_SHOWN, null));

            mEventHistory.addEvent(new Event(Event.TYPE_SAVE_SHOWN, null));

        }

    }
@@ -550,8 +550,7 @@ final class AutofillManagerServiceImpl { 
     */

    void setDatasetSelected(@Nullable String selectedDataset) {

        synchronized (mLock) {

            mEventHistory.addEvent(

                    new FillEventHistory.Event(FillEventHistory.Event.TYPE_DATASET_SELECTED, selectedDataset));

            mEventHistory.addEvent(new Event(Event.TYPE_DATASET_SELECTED, selectedDataset));

        }

    }
@@ -601,7 +600,8 @@ final class AutofillManagerServiceImpl { 
            }

        }



        if (mEventHistory == null || mEventHistory.getEvents().size() == 0) {

        if (mEventHistory == null || mEventHistory.getEvents() == null

                || mEventHistory.getEvents().size() == 0) {

            pw.print(prefix); pw.println("No event on last fill response");

        } else {

            pw.print(prefix); pw.println("Events of last fill response:");
@@ -609,7 +609,7 @@ final class AutofillManagerServiceImpl { 


            int numEvents = mEventHistory.getEvents().size();

            for (int i = 0; i < numEvents; i++) {

                FillEventHistory.Event event = mEventHistory.getEvents().get(i);

                final Event event = mEventHistory.getEvents().get(i);

                pw.println("  " + i + ": eventType=" + event.getType() + " datasetId="

                        + event.getDatasetId());

            }

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

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


package com.android.server.autofill;



import static android.view.autofill.AutofillManager.FLAG_MANUAL_REQUEST;

import static android.service.autofill.FillRequest.FLAG_MANUAL_REQUEST;

import static android.view.autofill.AutofillManager.FLAG_START_SESSION;

import static android.view.autofill.AutofillManager.FLAG_VALUE_CHANGED;

import static android.view.autofill.AutofillManager.FLAG_VIEW_ENTERED;