From 9376b90d3f33a4b6ea1b6a8ad97f4f1d12d42a4e Mon Sep 17 00:00:00 2001
From: TYM Tsai <tymtsai@google.com>
Date: Thu, 26 Dec 2019 15:17:42 +0800
Subject: [PATCH] Updates the cached service while the package re-enabling

The autofill would flag to use the augmented service only when try
to start the autofill service which was disabled. The behavior keeps
the same even if the autofill service is re-enabled.
To fix the issue, updates the invalid cached service to reflash while
the default service package has changed.

Fixes: 146392487
Test: atest CtsAutoFillServiceTestCases
Change-Id: I44383a25ea4fb83cb38e4166272beb1ac2ebfa59
---
 .../infra/AbstractMasterSystemService.java    | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/services/core/java/com/android/server/infra/AbstractMasterSystemService.java b/services/core/java/com/android/server/infra/AbstractMasterSystemService.java
index 58f6ba2fd67fc..d729a968a60f0 100644
--- a/services/core/java/com/android/server/infra/AbstractMasterSystemService.java
+++ b/services/core/java/com/android/server/infra/AbstractMasterSystemService.java
@@ -954,6 +954,35 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem
                 onServicePackageRestartedLocked(userId);
             }
 
+            @Override
+            public void onPackageModified(String packageName) {
+                if (verbose) Slog.v(mTag, "onPackageModified(): " + packageName);
+
+                final int userId = getChangingUserId();
+                final String serviceName = mServiceNameResolver.getDefaultServiceName(userId);
+                if (serviceName == null) {
+                    return;
+                }
+
+                final ComponentName serviceComponentName =
+                        ComponentName.unflattenFromString(serviceName);
+                if (serviceComponentName == null
+                        || !serviceComponentName.getPackageName().equals(packageName)) {
+                    return;
+                }
+
+                // The default service package has changed, update the cached if the service
+                // exists but no active component.
+                final S service = peekServiceForUserLocked(userId);
+                if (service != null) {
+                    final ComponentName componentName = service.getServiceComponentName();
+                    if (componentName == null) {
+                        if (verbose) Slog.v(mTag, "update cached");
+                        updateCachedServiceLocked(userId);
+                    }
+                }
+            }
+
             private String getActiveServicePackageNameLocked() {
                 final int userId = getChangingUserId();
                 final S service = peekServiceForUserLocked(userId);