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

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

Merge changes from topic "sv2sec" into sc-v2-dev-plus-aosp 

* changes:
  [automerge] [scv2] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. 2p: b157e658
  [scv2] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning.
parents ca3bd42f 58bbfc41

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

+22 −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;










@@ -167,6 +168,27 @@ public class DevicePolicyManager {













        this(context, service, false);















    }



























    /**













     * 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













     */













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













        }













    }



























    /** @hide */















    @VisibleForTesting















    protected DevicePolicyManager(Context context, IDevicePolicyManager service,

































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.NetworkEvent;















import android.app.IApplicationThread;















import android.app.IServiceConnection;










@@ -98,6 +99,8 @@ interface IDevicePolicyManager {













    int getCurrentFailedPasswordAttempts(int userHandle, boolean parent);















    int getProfileWithMinimumFailedPasswordsForWipe(int userHandle, boolean parent);





























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





























    void setMaximumFailedPasswordsForWipe(in ComponentName admin, int num, boolean parent);















    int getMaximumFailedPasswordsForWipe(in ComponentName admin, int userHandle, boolean parent);

















































core/res/AndroidManifest.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -100,6 +100,7 @@













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















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















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













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































    <protected-broadcast android:name="android.os.action.POWER_SAVE_MODE_CHANGED" />















    <protected-broadcast android:name="android.os.action.DEVICE_IDLE_MODE_CHANGED" />

































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



+7
−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.DevicePolicySafetyChecker;










@@ -58,6 +59,7 @@ abstract class BaseIDevicePolicyManager extends IDevicePolicyManager.Stub {













     * @see {@link SystemService#onUserUnlocking}















     */















    abstract void handleUnlockUser(int userId);





























    /**















     * To be called by {@link DevicePolicyManagerService#Lifecycle} after a user is being unlocked.















     *










@@ -133,6 +135,11 @@ abstract class BaseIDevicePolicyManager extends IDevicePolicyManager.Stub {













        return null;















    }





























    public void finalizeWorkProfileProvisioning(













            UserHandle managedProfileUser, Account migratedAccount) {



























    }





























    public void provisionFullyManagedDevice(















            FullyManagedDeviceProvisioningParams provisioningParams, String callerPackage) {















    }

































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



+31
−0




























Original line number
Diff line number
Diff line








@@ -26,6 +26,7 @@ import static android.app.AppOpsManager.MODE_DEFAULT;













import static android.app.admin.DeviceAdminReceiver.ACTION_COMPLIANCE_ACKNOWLEDGEMENT_REQUIRED;















import static android.app.admin.DeviceAdminReceiver.EXTRA_TRANSFER_OWNERSHIP_ADMIN_EXTRAS_BUNDLE;















import static android.app.admin.DevicePolicyManager.ACTION_CHECK_POLICY_COMPLIANCE;













import static android.app.admin.DevicePolicyManager.ACTION_MANAGED_PROFILE_PROVISIONED;















import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE;















import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE;















import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_USER;










@@ -56,6 +57,7 @@ import static android.app.admin.DevicePolicyManager.DELEGATION_PACKAGE_ACCESS;













import static android.app.admin.DevicePolicyManager.DELEGATION_PERMISSION_GRANT;















import static android.app.admin.DevicePolicyManager.DELEGATION_SECURITY_LOGGING;















import static android.app.admin.DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE_PER_USER;













import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE;















import static android.app.admin.DevicePolicyManager.ID_TYPE_BASE_INFO;















import static android.app.admin.DevicePolicyManager.ID_TYPE_IMEI;















import static android.app.admin.DevicePolicyManager.ID_TYPE_INDIVIDUAL_ATTESTATION;










@@ -10568,6 +10570,35 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













        }















    }



























    @Override













    public void finalizeWorkProfileProvisioning(UserHandle managedProfileUser,













            Account migratedAccount) {













        Preconditions.checkCallAuthorization(













                hasCallingOrSelfPermission(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS));

























        if (!isManagedProfile(managedProfileUser.getIdentifier())) {













            throw new IllegalStateException("Given user is not a managed profile");













        }













        ComponentName profileOwnerComponent =













                mOwners.getProfileOwnerComponent(managedProfileUser.getIdentifier());













        if (profileOwnerComponent == null) {













            throw new IllegalStateException("There is no profile owner on the given profile");













        }













        Intent primaryProfileSuccessIntent = new Intent(ACTION_MANAGED_PROFILE_PROVISIONED);













        primaryProfileSuccessIntent.setPackage(profileOwnerComponent.getPackageName());













        primaryProfileSuccessIntent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES













                | Intent.FLAG_RECEIVER_FOREGROUND);













        primaryProfileSuccessIntent.putExtra(Intent.EXTRA_USER, managedProfileUser);

























        if (migratedAccount != null) {













            primaryProfileSuccessIntent.putExtra(EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE,













                    migratedAccount);













        }

























        mContext.sendBroadcastAsUser(primaryProfileSuccessIntent,













                UserHandle.of(getProfileParentId(managedProfileUser.getIdentifier())));













    }



























    @Override















    public UserHandle createAndManageUser(ComponentName admin, String name,















            ComponentName profileOwner, PersistableBundle adminExtras, int flags) {