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

Commit b73002c5 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Dump autofill service component from settings." into oc-dev am: d3ed35f6 

am: 2e9bcf9b

Change-Id: I5092e7802e8d5733a0ab61f87c0d7b50602f5f05
parents a2853b79 2e9bcf9b

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