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

Commit 61a17f33 authored by Felipe Leme's avatar Felipe Leme
Browse files

Made AugmentedAutofillService.dump() final so subclass cannot hide it. 

Test: m update-api
Bug: 122076014

Change-Id: Id171d3208fb12cca429af913e98233efb69f1eb7
parent e6baf1a4

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -5127,6 +5127,8 @@ package android.service.autofill.augmented { 


  public abstract class AugmentedAutofillService extends android.app.Service {

    ctor public AugmentedAutofillService();

    method protected final void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);

    method protected void dump(java.io.PrintWriter, java.lang.String[]);

    method public void onFillRequest(android.service.autofill.augmented.FillRequest, android.os.CancellationSignal, android.service.autofill.augmented.FillController, android.service.autofill.augmented.FillCallback);

    field public static final java.lang.String SERVICE_INTERFACE = "android.service.autofill.augmented.AugmentedAutofillService";

  }

core/java/android/service/autofill/augmented/AugmentedAutofillService.java

+10 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ public abstract class AugmentedAutofillService extends Service { 
    }



    @Override

    protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

    protected final void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        if (mAutofillProxies != null) {

            final int size = mAutofillProxies.size();

            pw.print("Number proxies: "); pw.println(size);
@@ -225,6 +225,15 @@ public abstract class AugmentedAutofillService extends Service { 
                proxy.dump("  ", pw);

            }

        }

        dump(pw, args);

    }



    /**

     * Implementation specific {@code dump}.

     */

    protected void dump(@NonNull PrintWriter pw,

            @SuppressWarnings("unused") @NonNull String[] args) {

        pw.print(getClass().getName()); pw.println(": nothing to dump");

    }



    /** @hide */

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

+5 −2
Original line number Diff line number Diff line
@@ -870,8 +870,11 @@ final class AutofillManagerServiceImpl 
        }

        pw.print(prefix); pw.print("Default component: "); pw.println(getContext()

                .getString(R.string.config_defaultAutofillService));

        pw.print(prefix); pw.print("mAugmentedAutofillNamer: ");

        mAugmentedAutofillResolver.dumpShort(pw); pw.println();



        pw.print(prefix); pw.println("mAugmentedAutofillNamer: ");

        pw.print(prefix2); mAugmentedAutofillResolver.dumpShort(pw); pw.println();

        pw.print(prefix2); mAugmentedAutofillResolver.dumpShort(pw, mUserId); pw.println();



        if (mRemoteAugmentedAutofillService != null) {

            pw.print(prefix); pw.println("RemoteAugmentedAutofillService: ");

            mRemoteAugmentedAutofillService.dump(prefix2, pw);