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

Change-Id: Ia15c34a4121d99a2eaf88d76c6849e6d643beb42
This commit is contained in:
Joanne Chung
2020-05-25 11:59:07 +00:00
committed by Automerger Merge Worker

View File

@@ -1662,12 +1662,8 @@ public final class AutofillManagerService
@NonNull IResultReceiver receiver) {
boolean enabled = false;
synchronized (mLock) {
final AutofillManagerServiceImpl service = peekServiceForUserLocked(userId);
if (service != null) {
enabled = Objects.equals(packageName, service.getServicePackageName());
} else if (sVerbose) {
Slog.v(TAG, "isServiceEnabled(): no service for " + userId);
}
final AutofillManagerServiceImpl service = getServiceForUserLocked(userId);
enabled = Objects.equals(packageName, service.getServicePackageName());
}
send(receiver, enabled);
}