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

Commit fad9b07e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 4396a742 aa00896b

core/java/android/provider/Settings.java

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

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) {