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

Commit 98d5c7f6 authored by Felipe Leme's avatar Felipe Leme
Browse files

Dump autofill service component from settings. 

Bug: 36978445
Test: manual verification

Change-Id: I30992452c94a78c05a5a98e94d5ffc5325151a76
parent c85aa306

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

+12 −7
Original line number Diff line number Diff line
@@ -194,13 +194,17 @@ final class AutofillManagerServiceImpl { 
        }

    }



    private String getComponentNameFromSettings() {

        return Settings.Secure.getStringForUser(

                mContext.getContentResolver(), Settings.Secure.AUTOFILL_SERVICE, mUserId);

    }



    void updateLocked(boolean disabled) {

        final boolean wasEnabled = isEnabled();

        mDisabled = disabled;

        ComponentName serviceComponent = null;

        ServiceInfo serviceInfo = null;

        final String componentName = Settings.Secure.getStringForUser(

                mContext.getContentResolver(), Settings.Secure.AUTOFILL_SERVICE, mUserId);

        final String componentName = getComponentNameFromSettings();

        if (!TextUtils.isEmpty(componentName)) {

            try {

                serviceComponent = ComponentName.unflattenFromString(componentName);
@@ -413,8 +417,7 @@ final class AutofillManagerServiceImpl { 
    void disableSelf() {

        final long identity = Binder.clearCallingIdentity();

        try {

            final String autoFillService = Settings.Secure.getStringForUser(

                    mContext.getContentResolver(), Settings.Secure.AUTOFILL_SERVICE, mUserId);

            final String autoFillService = getComponentNameFromSettings();

            if (mInfo.getServiceInfo().getComponentName().equals(

                    ComponentName.unflattenFromString(autoFillService))) {

                Settings.Secure.putStringForUser(mContext.getContentResolver(),
@@ -435,6 +438,8 @@ final class AutofillManagerServiceImpl { 
        pw.print(prefix); pw.print("User: "); pw.println(mUserId);

        pw.print(prefix); pw.print("Component: "); pw.println(mInfo != null

                ? mInfo.getServiceInfo().getComponentName() : null);

        pw.print(prefix); pw.print("Component from settings: ");

            pw.println(getComponentNameFromSettings());

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

            pw.println(mContext.getString(R.string.config_defaultAutofillService));

        pw.print(prefix); pw.print("Disabled: "); pw.println(mDisabled);