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

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

Merge "Clone autofill service settings on managed profile." into oc-dev am: fad9b07e 

am: 0f3a9cf1

Change-Id: I24535dee497b3a4c0e7247f0cf5bb3e6054f62f0
parents 82b7749b 0f3a9cf1

core/java/android/provider/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -7085,6 +7085,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);

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

+2 −2
Original line number Diff line number Diff line
@@ -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) {