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

Commit 538aa69b authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

Merge "Fix hasEnabledAutofillServices() return wrong value after... 

Merge "Fix hasEnabledAutofillServices() return wrong value after AutofillServie updated" into rvc-dev am: ab476cc5 am: 74a9db9e

Change-Id: If5df2f5d2a9505bcc19588de6c4c607f2709dd60
parents 6285a4ef 74a9db9e

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

+2 −6
Original line number Original line Diff line number Diff line
@@ -1662,12 +1662,8 @@ public final class AutofillManagerService 
                @NonNull IResultReceiver receiver) {

                @NonNull IResultReceiver receiver) {

            boolean enabled = false;

            boolean enabled = false;

            synchronized (mLock) {

            synchronized (mLock) {

                final AutofillManagerServiceImpl service = peekServiceForUserLocked(userId);

                final AutofillManagerServiceImpl service = getServiceForUserLocked(userId);

                if (service != null) {

                enabled = Objects.equals(packageName, service.getServicePackageName());

                enabled = Objects.equals(packageName, service.getServicePackageName());

                } else if (sVerbose) {

                    Slog.v(TAG, "isServiceEnabled(): no service for " + userId);

                }

            }

            }

            send(receiver, enabled);

            send(receiver, enabled);

        }

        }