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

Commit 8d63f9a3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Non-managed profiles autoapply USER_SETUP_COMPLETE" into udc-dev am: 86e62654 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22432978



Change-Id: Iaab631174eb42b364fbdb87f4e7551e430eac2db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3bf0e18 86e62654

services/core/java/com/android/server/pm/UserTypeFactory.java

+12 −1
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ public final class UserTypeFactory { 
                        com.android.internal.R.color.system_neutral2_900)

                .setDefaultRestrictions(null)

                .setDefaultCrossProfileIntentFilters(getDefaultCloneCrossProfileIntentFilter())

                .setDefaultSecureSettings(getDefaultNonManagedProfileSecureSettings())

                .setDefaultUserProperties(new UserProperties.Builder()

                        .setStartWithParent(true)

                        .setShowInLauncher(UserProperties.SHOW_IN_LAUNCHER_WITH_PARENT)
@@ -216,7 +217,8 @@ public final class UserTypeFactory { 
                        com.android.internal.R.color.profile_badge_1_dark,

                        com.android.internal.R.color.profile_badge_2_dark,

                        com.android.internal.R.color.profile_badge_3_dark)

                .setDefaultRestrictions(restrictions);

                .setDefaultRestrictions(restrictions)

                .setDefaultSecureSettings(getDefaultNonManagedProfileSecureSettings());

    }



    /**
@@ -337,6 +339,15 @@ public final class UserTypeFactory { 
        return DefaultCrossProfileIntentFiltersUtils.getDefaultCloneProfileFilters();

    }



    /** Gets a default bundle, keyed by Settings.Secure String names, for non-managed profiles. */

    private static Bundle getDefaultNonManagedProfileSecureSettings() {

        final Bundle settings = new Bundle();

        // Non-managed profiles go through neither SetupWizard nor DPC flows, so we automatically

        // mark them as setup.

        settings.putString(android.provider.Settings.Secure.USER_SETUP_COMPLETE, "1");

        return settings;

    }



    /**

     * Reads the given xml parser to obtain device user-type customization, and updates the given

     * map of {@link UserTypeDetails.Builder}s accordingly.

services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ public final class UserManagerTest { 
                UserHandle.of(userInfo.id));

        assertThat(userContext.getSystemService(

                UserManager.class).isMediaSharedWithParent()).isTrue();

        assertThat(Settings.Secure.getInt(userContext.getContentResolver(),

                Settings.Secure.USER_SETUP_COMPLETE, 0)).isEqualTo(1);



        List<UserInfo> list = mUserManager.getUsers();

        List<UserInfo> cloneUsers = list.stream().filter(