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

Commit 0c581ec4 authored by Yanli Wan's avatar Yanli Wan Committed by Android (Google) Code Review
Browse files

Merge "Add support to start financed device provisioning"

parents 58bb1aba 01c9255e

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -812,6 +812,7 @@ package android.app.admin { 
    field public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_ALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_ALLOWED";

    field public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_DISALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_DISALLOWED";

    field public static final String ACTION_PROVISION_FINALIZATION = "android.app.action.PROVISION_FINALIZATION";

    field public static final String ACTION_PROVISION_FINANCED_DEVICE = "android.app.action.PROVISION_FINANCED_DEVICE";

    field public static final String ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE = "android.app.action.PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE";

    field public static final String ACTION_SET_PROFILE_OWNER = "android.app.action.SET_PROFILE_OWNER";

    field public static final String ACTION_STATE_USER_SETUP_COMPLETE = "android.app.action.STATE_USER_SETUP_COMPLETE";

core/java/android/app/admin/DevicePolicyManager.java

+40 −0
Original line number Diff line number Diff line
@@ -397,6 +397,42 @@ public class DevicePolicyManager { 
    public static final String ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE =

            "android.app.action.PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE";



    /**

     * Activity action: Starts the provisioning flow which sets up a financed device.

     *

     * <p>During financed device provisioning, a device admin app is downloaded and set as the owner

     * of the device. A device owner has full control over the device. The device owner can not be

     * modified by the user.

     *

     * <p>A typical use case would be a device that is bought from the reseller through financing

     * program.

     *

     * <p>An intent with this action can be sent only on an unprovisioned device.

     *

     * <p>Unlike {@link #ACTION_PROVISION_MANAGED_DEVICE}, the provisioning message can only be sent

     * by a privileged app with the permission

     * {@link android.Manifest.permission#DISPATCH_PROVISIONING_MESSAGE}.

     *

     * <p>The provisioning intent contains the following properties:

     * <ul>

     * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME}</li>

     * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_LABEL}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_ICON_URI}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_SUPPORT_URL}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_ORGANIZATION_NAME}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}, optional</li>

     * </ul>

     *

     * @hide

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    @SystemApi

    public static final String ACTION_PROVISION_FINANCED_DEVICE =

            "android.app.action.PROVISION_FINANCED_DEVICE";



    /**

     * Activity action: Starts the provisioning flow which sets up a managed device.

     * Must be started with {@link android.app.Activity#startActivityForResult(Intent, int)}.
@@ -864,6 +900,7 @@ public class DevicePolicyManager { 
     * The name is displayed only during provisioning.

     *

     * <p>Use in an intent with action {@link #ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE}

     * or {@link #ACTION_PROVISION_FINANCED_DEVICE}

     *

     * @hide

     */
@@ -876,6 +913,7 @@ public class DevicePolicyManager { 
     * during provisioning. If the url is not HTTPS, an error will be shown.

     *

     * <p>Use in an intent with action {@link #ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE}

     * or {@link #ACTION_PROVISION_FINANCED_DEVICE}

     *

     * @hide

     */
@@ -888,6 +926,7 @@ public class DevicePolicyManager { 
     * as the app label of the package.

     *

     * <p>Use in an intent with action {@link #ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE}

     * or {@link #ACTION_PROVISION_FINANCED_DEVICE}

     *

     * @hide

     */
@@ -912,6 +951,7 @@ public class DevicePolicyManager { 
     * {@link android.content.ClipData} of the intent too.

     *

     * <p>Use in an intent with action {@link #ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE}

     * or {@link #ACTION_PROVISION_FINANCED_DEVICE}

     *

     * @hide

     */

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -12212,6 +12212,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                case DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE:

                    return checkManagedProfileProvisioningPreCondition(packageName, callingUserId);

                case DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE:

                case DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE:

                    return checkDeviceOwnerProvisioningPreCondition(callingUserId);

                case DevicePolicyManager.ACTION_PROVISION_MANAGED_USER:

                    return checkManagedUserProvisioningPreCondition(callingUserId);

services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java

+33 −0
Original line number Diff line number Diff line
@@ -2845,6 +2845,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        mContext.packageName = admin1.getPackageName();

        setUpPackageManagerForAdmin(admin1, mContext.binder.callingUid);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE, false);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE, false);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE, false);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_SHAREABLE_DEVICE,

                false);
@@ -2856,6 +2857,8 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        mContext.callerPermissions.add(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,

                DevicePolicyManager.CODE_DEVICE_ADMIN_NOT_SUPPORTED);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE,

                DevicePolicyManager.CODE_DEVICE_ADMIN_NOT_SUPPORTED);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,

                DevicePolicyManager.CODE_DEVICE_ADMIN_NOT_SUPPORTED);

        assertCheckProvisioningPreCondition(
@@ -2882,6 +2885,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        mContext.packageName = admin1.getPackageName();

        setUpPackageManagerForAdmin(admin1, mContext.binder.callingUid);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE, true);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE, true);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE, false);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_SHAREABLE_DEVICE,

                false);
@@ -2890,6 +2894,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        // Test again when split user is on

        when(getServices().userManagerForMock.isSplitSystemUser()).thenReturn(true);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE, true);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE, true);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE, false);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_SHAREABLE_DEVICE,

                true);
@@ -2901,6 +2906,8 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        mContext.callerPermissions.add(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,

                DevicePolicyManager.CODE_OK);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE,

                DevicePolicyManager.CODE_OK);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,

                DevicePolicyManager.CODE_MANAGED_USERS_NOT_SUPPORTED);

        assertCheckProvisioningPreCondition(
@@ -2913,6 +2920,8 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        when(getServices().userManagerForMock.isSplitSystemUser()).thenReturn(true);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,

                DevicePolicyManager.CODE_OK);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE,

                DevicePolicyManager.CODE_OK);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,

                DevicePolicyManager.CODE_MANAGED_USERS_NOT_SUPPORTED);

        assertCheckProvisioningPreCondition(
@@ -2938,6 +2947,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        mContext.packageName = admin1.getPackageName();

        setUpPackageManagerForAdmin(admin1, mContext.binder.callingUid);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE, true);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE, true);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE, true);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_SHAREABLE_DEVICE,

                false /* because of non-split user */);
@@ -2951,6 +2961,8 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        mContext.callerPermissions.add(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,

                DevicePolicyManager.CODE_OK);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE,

                DevicePolicyManager.CODE_OK);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,

                DevicePolicyManager.CODE_OK);

        assertCheckProvisioningPreCondition(
@@ -2995,6 +3007,8 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        setUpPackageManagerForAdmin(admin1, mContext.binder.callingUid);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,

                false/* because of completed device setup */);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE,

                false/* because of completed device setup */);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE, true);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_SHAREABLE_DEVICE,

                false/* because of non-split user */);
@@ -3008,6 +3022,8 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        mContext.callerPermissions.add(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,

                DevicePolicyManager.CODE_USER_SETUP_COMPLETED);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE,

                DevicePolicyManager.CODE_USER_SETUP_COMPLETED);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,

                DevicePolicyManager.CODE_OK);

        assertCheckProvisioningPreCondition(
@@ -3024,7 +3040,10 @@ public class DevicePolicyManagerTest extends DpmTestBase { 


        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,

                DevicePolicyManager.CODE_HAS_DEVICE_OWNER);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE,

                DevicePolicyManager.CODE_HAS_DEVICE_OWNER);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE, false);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE, false);



        // COMP mode is allowed.

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,
@@ -3153,6 +3172,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        mContext.packageName = admin1.getPackageName();

        setUpPackageManagerForAdmin(admin1, mContext.binder.callingUid);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE, true);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE, true);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,

                false /* because canAddMoreManagedProfiles returns false */);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_SHAREABLE_DEVICE,
@@ -3167,6 +3187,8 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        mContext.callerPermissions.add(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,

                DevicePolicyManager.CODE_OK);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE,

                DevicePolicyManager.CODE_OK);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,

                DevicePolicyManager.CODE_SPLIT_SYSTEM_USER_DEVICE_SYSTEM_USER);

        assertCheckProvisioningPreCondition(
@@ -3193,6 +3215,8 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        setUpPackageManagerForAdmin(admin1, mContext.binder.callingUid);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,

                true/* it's undefined behavior. Can be changed into false in the future */);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE,

                true/* it's undefined behavior. Can be changed into false in the future */);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,

                false /* because canAddMoreManagedProfiles returns false */);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_SHAREABLE_DEVICE,
@@ -3207,6 +3231,8 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        mContext.callerPermissions.add(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,

                DevicePolicyManager.CODE_OK);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE,

                DevicePolicyManager.CODE_OK);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,

                DevicePolicyManager.CODE_SPLIT_SYSTEM_USER_DEVICE_SYSTEM_USER);

        assertCheckProvisioningPreCondition(
@@ -3232,6 +3258,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        mContext.packageName = admin1.getPackageName();

        setUpPackageManagerForAdmin(admin1, mContext.binder.callingUid);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE, true);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE, true);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE, true);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_SHAREABLE_DEVICE,

                true);
@@ -3244,6 +3271,8 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        mContext.callerPermissions.add(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,

                DevicePolicyManager.CODE_OK);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE,

                DevicePolicyManager.CODE_OK);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,

                DevicePolicyManager.CODE_OK);

        assertCheckProvisioningPreCondition(
@@ -3271,6 +3300,8 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        setUpPackageManagerForAdmin(admin1, mContext.binder.callingUid);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,

                true/* it's undefined behavior. Can be changed into false in the future */);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE,

                true/* it's undefined behavior. Can be changed into false in the future */);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE, true);

        assertProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_SHAREABLE_DEVICE,

                true/* it's undefined behavior. Can be changed into false in the future */);
@@ -3284,6 +3315,8 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        mContext.callerPermissions.add(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,

                DevicePolicyManager.CODE_OK);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE,

                DevicePolicyManager.CODE_OK);

        assertCheckProvisioningPreCondition(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,

                DevicePolicyManager.CODE_OK);

        assertCheckProvisioningPreCondition(