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

Commit cd281370 authored by Adam Bookatz's avatar Adam Bookatz Committed by Android (Google) Code Review
Browse files

Merge "Generic Test profile on debuggable builds"

parents 418a0525 cb017390

core/java/android/os/UserManager.java

+6 −0
Original line number Diff line number Diff line
@@ -135,6 +135,12 @@ public class UserManager { 
    @SystemApi

    public static final String USER_TYPE_PROFILE_MANAGED = "android.os.usertype.profile.MANAGED";



    /**

     * User type representing a generic profile for testing purposes. Only on debuggable builds.

     * @hide

     */

    public static final String USER_TYPE_PROFILE_TEST = "android.os.usertype.profile.TEST";



    /**

     * User type representing a {@link UserHandle#USER_SYSTEM system} user that is <b>not</b> a

     * human user.

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

+36 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import static android.os.UserManager.USER_TYPE_FULL_RESTRICTED; 
import static android.os.UserManager.USER_TYPE_FULL_SECONDARY;

import static android.os.UserManager.USER_TYPE_FULL_SYSTEM;

import static android.os.UserManager.USER_TYPE_PROFILE_MANAGED;

import static android.os.UserManager.USER_TYPE_PROFILE_TEST;

import static android.os.UserManager.USER_TYPE_SYSTEM_HEADLESS;



import static com.android.server.pm.UserTypeDetails.UNLIMITED_NUMBER_OF_USERS;
@@ -37,6 +38,7 @@ import static com.android.server.pm.UserTypeDetails.UNLIMITED_NUMBER_OF_USERS; 
import android.content.pm.UserInfo;

import android.content.res.Resources;

import android.content.res.XmlResourceParser;

import android.os.Build;

import android.os.Bundle;

import android.os.UserManager;

import android.util.ArrayMap;
@@ -98,6 +100,9 @@ public final class UserTypeFactory { 
        builders.put(USER_TYPE_FULL_DEMO, getDefaultTypeFullDemo());

        builders.put(USER_TYPE_FULL_RESTRICTED, getDefaultTypeFullRestricted());

        builders.put(USER_TYPE_SYSTEM_HEADLESS, getDefaultTypeSystemHeadless());

        if (Build.IS_DEBUGGABLE) {

            builders.put(USER_TYPE_PROFILE_TEST, getDefaultTypeProfileTest());

        }



        return builders;

    }
@@ -131,6 +136,37 @@ public final class UserTypeFactory { 
                .setDefaultRestrictions(null);

    }



    /**

     * Returns the Builder for the default {@link UserManager#USER_TYPE_PROFILE_TEST}

     * configuration (for userdebug builds). For now it just uses managed profile badges.

     */

    private static UserTypeDetails.Builder getDefaultTypeProfileTest() {

        final Bundle restrictions = new Bundle();

        restrictions.putBoolean(UserManager.DISALLOW_FUN, true);



        return new UserTypeDetails.Builder()

                .setName(USER_TYPE_PROFILE_TEST)

                .setBaseType(FLAG_PROFILE)

                .setMaxAllowedPerParent(2)

                .setLabel(0)

                .setIconBadge(com.android.internal.R.drawable.ic_corp_icon_badge_case)

                .setBadgePlain(com.android.internal.R.drawable.ic_corp_badge_case)

                .setBadgeNoBackground(com.android.internal.R.drawable.ic_corp_badge_no_background)

                .setBadgeLabels(

                        com.android.internal.R.string.managed_profile_label_badge,

                        com.android.internal.R.string.managed_profile_label_badge_2,

                        com.android.internal.R.string.managed_profile_label_badge_3)

                .setBadgeColors(

                        com.android.internal.R.color.profile_badge_1,

                        com.android.internal.R.color.profile_badge_2,

                        com.android.internal.R.color.profile_badge_3)

                .setDarkThemeBadgeColors(

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

    }



    /**

     * Returns the Builder for the default {@link UserManager#USER_TYPE_FULL_SECONDARY}

     * configuration.