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

Commit 95826d61 authored by Jonathan Scott's avatar Jonathan Scott Committed by Android (Google) Code Review
Browse files

Merge "Add finalizeWorkProfileProvisioning." into tm-dev

parents 7da1954f 1355042e

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1079,6 +1079,7 @@ package android.app.admin { 
    method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public int checkProvisioningPrecondition(@NonNull String, @NonNull String);

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public android.os.UserHandle createAndProvisionManagedProfile(@NonNull android.app.admin.ManagedProfileProvisioningParams) throws android.app.admin.ProvisioningException;

    method @Nullable public android.content.Intent createProvisioningIntentFromNfcIntent(@NonNull android.content.Intent);

    method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void finalizeWorkProfileProvisioning(@NonNull android.os.UserHandle, @Nullable android.accounts.Account);

    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public boolean getBluetoothContactSharingDisabled(@NonNull android.os.UserHandle);

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public String getDeviceOwner();

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}) public android.content.ComponentName getDeviceOwnerComponentOnAnyUser();

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

+23 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.net.NetworkCapabilities.NET_ENTERPRISE_ID_1; 
import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;















import android.Manifest.permission;













import android.accounts.Account;















import android.annotation.CallbackExecutor;















import android.annotation.ColorInt;















import android.annotation.IntDef;










@@ -14862,6 +14863,28 @@ public class DevicePolicyManager {













        }















    }



























    /**













     * Called when a managed profile has been provisioned.













     *













     * @throws SecurityException if the caller does not hold













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













     * @hide













     */













    @SystemApi













    @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS)













    public void finalizeWorkProfileProvisioning(













            @NonNull UserHandle managedProfileUser, @Nullable Account migratedAccount) {













        Objects.requireNonNull(managedProfileUser, "managedProfileUser can't be null");













        if (mService == null) {













            throw new IllegalStateException("Could not find DevicePolicyManagerService");













        }













        try {













            mService.finalizeWorkProfileProvisioning(managedProfileUser, migratedAccount);













        } catch (RemoteException e) {













            throw e.rethrowFromSystemServer();













        }













    }



























    /**















     * The localized error message to show to the end-user. If {@code null}, a generic error















     * message will be shown.

























core/java/android/app/admin/IDevicePolicyManager.aidl



+3
−0




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@





























package android.app.admin;





























import android.accounts.Account;















import android.app.admin.DevicePolicyDrawableResource;















import android.app.admin.DevicePolicyStringResource;















import android.app.admin.ParcelableResource;










@@ -528,6 +529,8 @@ interface IDevicePolicyManager {













    UserHandle createAndProvisionManagedProfile(in ManagedProfileProvisioningParams provisioningParams, in String callerPackage);















    void provisionFullyManagedDevice(in FullyManagedDeviceProvisioningParams provisioningParams, in String callerPackage);





























    void finalizeWorkProfileProvisioning(in UserHandle managedProfileUser, in Account migratedAccount);





























    void setDeviceOwnerType(in ComponentName admin, in int deviceOwnerType);















    int getDeviceOwnerType(in ComponentName admin);

















































core/res/AndroidManifest.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -528,6 +528,7 @@













    <protected-broadcast android:name="android.intent.action.MANAGED_PROFILE_ADDED" />















    <protected-broadcast android:name="android.intent.action.MANAGED_PROFILE_UNLOCKED" />















    <protected-broadcast android:name="android.intent.action.MANAGED_PROFILE_REMOVED" />













    <protected-broadcast android:name="android.app.action.MANAGED_PROFILE_PROVISIONED" />































    <protected-broadcast android:name="android.bluetooth.adapter.action.BLE_STATE_CHANGED" />















    <protected-broadcast android:name="com.android.bluetooth.map.USER_CONFIRM_TIMEOUT" />

































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



+6
−0




























Original line number
Diff line number
Diff line








@@ -15,6 +15,7 @@













 */















package com.android.server.devicepolicy;





























import android.accounts.Account;















import android.annotation.NonNull;















import android.annotation.UserIdInt;















import android.app.admin.DevicePolicyDrawableResource;










@@ -138,6 +139,11 @@ abstract class BaseIDevicePolicyManager extends IDevicePolicyManager.Stub {













        return null;















    }





























    public void finalizeWorkProfileProvisioning(













            UserHandle managedProfileUser, Account migratedAccount) {



























    }





























    public void provisionFullyManagedDevice(















            FullyManagedDeviceProvisioningParams provisioningParams, String callerPackage) {















    }