diff options
| author | 2017-04-18 14:54:33 -0700 | |
|---|---|---|
| committer | 2017-04-18 15:14:43 -0700 | |
| commit | aa00896b8dda3b73e8ce73b5caa9308af7e89fa8 (patch) | |
| tree | 2b69811e3b4ac29e30c2917debe718bec13e98c0 | |
| parent | 2ed861d560defda9d43081f2cb35f3112cce2092 (diff) | |
Clone autofill service settings on managed profile.
Test: manual verification
Change-Id: I9d13e4230265b18444bfd30fd403c5fb98b88159
Fixes: 37351722
| -rwxr-xr-x | core/java/android/provider/Settings.java | 1 | ||||
| -rw-r--r-- | services/autofill/java/com/android/server/autofill/AutofillManagerService.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index c6ea9586374d..f32f163a86b0 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7077,6 +7077,7 @@ public final class Settings { CLONE_TO_MANAGED_PROFILE.add(ACCESSIBILITY_ENABLED); CLONE_TO_MANAGED_PROFILE.add(ALLOW_MOCK_LOCATION); CLONE_TO_MANAGED_PROFILE.add(ALLOWED_GEOLOCATION_ORIGINS); + CLONE_TO_MANAGED_PROFILE.add(AUTOFILL_SERVICE); CLONE_TO_MANAGED_PROFILE.add(DEFAULT_INPUT_METHOD); CLONE_TO_MANAGED_PROFILE.add(ENABLED_ACCESSIBILITY_SERVICES); CLONE_TO_MANAGED_PROFILE.add(ENABLED_INPUT_METHODS); diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java index d6f525655d56..ad7ff1b5b5a8 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java @@ -184,7 +184,7 @@ public final class AutofillManagerService extends SystemService { } @Override - public void onStopUser(int userId) { + public void onCleanupUser(int userId) { synchronized (mLock) { removeCachedServiceLocked(userId); } @@ -211,7 +211,7 @@ public final class AutofillManagerService extends SystemService { /** * Peeks the service instance for a user. * - * @return service instance or null if not already present + * @return service instance or {@code null} if not already present */ @Nullable AutofillManagerServiceImpl peekServiceForUserLocked(int userId) { |