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

Commit 2a5a43d6 authored by Antoan Angelov's avatar Antoan Angelov Committed by Android (Google) Code Review
Browse files

Merge changes from topic "dpc-migration-atomic" 

* changes:
  Notify DO after PO ownership transfer when they belong to affiliated users.
  Tests for owner transfer atomicity.
  Make owner transfer an atomic operation.
parents f4e01170 b46faf35

api/current.txt

+3 −1
Original line number Diff line number Diff line
@@ -6348,6 +6348,7 @@ package android.app.admin { 
    method public void onReceive(android.content.Context, android.content.Intent);

    method public void onSecurityLogsAvailable(android.content.Context, android.content.Intent);

    method public void onSystemUpdatePending(android.content.Context, android.content.Intent, long);

    method public void onTransferAffiliatedProfileOwnershipComplete(android.content.Context, android.os.UserHandle);

    method public void onTransferOwnershipComplete(android.content.Context, android.os.PersistableBundle);

    method public void onUserAdded(android.content.Context, android.content.Intent, android.os.UserHandle);

    method public void onUserRemoved(android.content.Context, android.content.Intent, android.os.UserHandle);
@@ -6369,7 +6370,7 @@ package android.app.admin { 
    field public static final java.lang.String DEVICE_ADMIN_META_DATA = "android.app.device_admin";

    field public static final java.lang.String EXTRA_DISABLE_WARNING = "android.app.extra.DISABLE_WARNING";

    field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE";

    field public static final java.lang.String EXTRA_TRANSFER_OWNER_ADMIN_EXTRAS_BUNDLE = "android.app.extra.TRANSFER_OWNER_ADMIN_EXTRAS_BUNDLE";

    field public static final java.lang.String EXTRA_TRANSFER_OWNERSHIP_ADMIN_EXTRAS_BUNDLE = "android.app.extra.TRANSFER_OWNERSHIP_ADMIN_EXTRAS_BUNDLE";

    field public static final java.lang.String SUPPORT_TRANSFER_OWNERSHIP_META_DATA = "android.app.support_transfer_ownership";

  }










@@ -6457,6 +6458,7 @@ package android.app.admin {













    method public boolean getStorageEncryption(android.content.ComponentName);















    method public int getStorageEncryptionStatus();















    method public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy();













    method public android.os.PersistableBundle getTransferOwnershipBundle();















    method public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName);















    method public android.os.Bundle getUserRestrictions(android.content.ComponentName);















    method public java.lang.String getWifiMacAddress(android.content.ComponentName);

























core/java/android/app/admin/DeviceAdminReceiver.java



+37
−5






























Original line number
Diff line number
Diff line








@@ -482,20 +482,29 @@ public class DeviceAdminReceiver extends BroadcastReceiver {













    public static final String ACTION_TRANSFER_OWNERSHIP_COMPLETE =















            "android.app.action.TRANSFER_OWNERSHIP_COMPLETE";





























    /**













     * Broadcast action: notify the device owner that the ownership of one of its affiliated













     * profiles is transferred.













     *













     * @hide













     */













    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)













    public static final String ACTION_AFFILIATED_PROFILE_TRANSFER_OWNERSHIP_COMPLETE =













            "android.app.action.AFFILIATED_PROFILE_TRANSFER_OWNERSHIP_COMPLETE";





























    /**















     * A {@link android.os.Parcelable} extra of type {@link android.os.PersistableBundle} that















     * allows a mobile device management application to pass data to the management application















     * instance after owner transfer.















     *













     * <p>













     * If the transfer is successful, the new device owner receives the data in













     * <p>If the transfer is successful, the new owner receives the data in















     * {@link DeviceAdminReceiver#onTransferOwnershipComplete(Context, PersistableBundle)}.















     * The bundle is not changed during the ownership transfer.















     *















     * @see DevicePolicyManager#transferOwnership(ComponentName, ComponentName, PersistableBundle)















     */













    public static final String EXTRA_TRANSFER_OWNER_ADMIN_EXTRAS_BUNDLE =













            "android.app.extra.TRANSFER_OWNER_ADMIN_EXTRAS_BUNDLE";













    public static final String EXTRA_TRANSFER_OWNERSHIP_ADMIN_EXTRAS_BUNDLE =













            "android.app.extra.TRANSFER_OWNERSHIP_ADMIN_EXTRAS_BUNDLE";































    /**















     * Name under which a device administration component indicates whether it supports transfer of










@@ -993,6 +1002,26 @@ public class DeviceAdminReceiver extends BroadcastReceiver {













            @Nullable PersistableBundle bundle) {















    }





























    /**













     * Called on the device owner when the ownership of one of its affiliated profiles is













     * transferred.













     *













     * <p>This can be used when transferring both device and profile ownership when using













     * work profile on a fully managed device. The process would look like this:













     * <ol>













     * <li>Transfer profile ownership</li>













     * <li>The device owner gets notified with this callback</li>













     * <li>Transfer device ownership</li>













     * <li>Both profile and device ownerships have been transferred</li>













     * </ol>













     *













     * @param context the running context as per {@link #onReceive}













     * @param user the {@link UserHandle} of the affiliated user













     * @see DevicePolicyManager#transferOwnership(ComponentName, ComponentName, PersistableBundle)













     */













    public void onTransferAffiliatedProfileOwnershipComplete(Context context, UserHandle user) {













    }





























    /**















     * Intercept standard device administrator broadcasts.  Implementations















     * should not override this method; it is better to implement the










@@ -1063,8 +1092,11 @@ public class DeviceAdminReceiver extends BroadcastReceiver {













            onUserSwitched(context, intent, intent.getParcelableExtra(Intent.EXTRA_USER));















        } else if (ACTION_TRANSFER_OWNERSHIP_COMPLETE.equals(action)) {















            PersistableBundle bundle =













                    intent.getParcelableExtra(EXTRA_TRANSFER_OWNER_ADMIN_EXTRAS_BUNDLE);













                    intent.getParcelableExtra(EXTRA_TRANSFER_OWNERSHIP_ADMIN_EXTRAS_BUNDLE);















            onTransferOwnershipComplete(context, bundle);













        } else if (ACTION_AFFILIATED_PROFILE_TRANSFER_OWNERSHIP_COMPLETE.equals(action)) {













            onTransferAffiliatedProfileOwnershipComplete(context,













                    intent.getParcelableExtra(Intent.EXTRA_USER));















        }















    }















}
























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



+29
−5






























Original line number
Diff line number
Diff line








@@ -9144,9 +9144,13 @@ public class DevicePolicyManager {













     *     <li>A profile owner can only be transferred to a new profile owner</li>















     * </ul>















     *













     * <p>Use the {@code bundle} parameter to pass data to the new administrator. The parameters













     * <p>Use the {@code bundle} parameter to pass data to the new administrator. The data















     * will be received in the













     * {@link DeviceAdminReceiver#onTransferOwnershipComplete(Context, PersistableBundle)} callback.













     * {@link DeviceAdminReceiver#onTransferOwnershipComplete(Context, PersistableBundle)}













     * callback of the new administrator.













     *













     * <p>The transfer has failed if the original administrator is still the corresponding owner













     * after calling this method.















     *















     * <p>The incoming target administrator must have the















     * {@link DeviceAdminReceiver#SUPPORT_TRANSFER_OWNERSHIP_META_DATA} <code>meta-data</code> tag









@@ -9157,11 +9161,11 @@ public class DevicePolicyManager {













     * @param target which {@link DeviceAdminReceiver} we want the new administrator to be















     * @param bundle data to be sent to the new administrator















     * @throws SecurityException if {@code admin} is not a device owner nor a profile owner













     * @throws IllegalArgumentException if {@code admin} or {@code target} is {@code null},













     * both are components in the same package or {@code target} is not an active admin













     * @throws IllegalArgumentException if {@code admin} or {@code target} is {@code null}, they













     * are components in the same package or {@code target} is not an active admin















     */















    public void transferOwnership(@NonNull ComponentName admin, @NonNull ComponentName target,













            PersistableBundle bundle) {













            @Nullable PersistableBundle bundle) {















        throwIfParentInstance("transferOwnership");















        try {















            mService.transferOwnership(admin, target, bundle);










@@ -9418,4 +9422,24 @@ public class DevicePolicyManager {













        }















        return false;















    }



























    /**













     * Returns the data passed from the current administrator to the new administrator during an













     * ownership transfer. This is the same {@code bundle} passed in













     * {@link #transferOwnership(ComponentName, ComponentName, PersistableBundle)}.













     *













     * <p>Returns <code>null</code> if no ownership transfer was started for the calling user.













     *













     * @see #transferOwnership













     * @see DeviceAdminReceiver#onTransferOwnershipComplete(Context, PersistableBundle)













     */













    @Nullable













    public PersistableBundle getTransferOwnershipBundle() {













        throwIfParentInstance("getTransferOwnershipBundle");













        try {













            return mService.getTransferOwnershipBundle();













        } catch (RemoteException re) {













            throw re.rethrowFromSystemServer();













        }













    }















}
























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



+2
−0






























Original line number
Diff line number
Diff line








@@ -391,7 +391,9 @@ interface IDevicePolicyManager {













    boolean isLogoutEnabled();































    List<String> getDisallowedSystemApps(in ComponentName admin, int userId, String provisioningAction);





























    void transferOwnership(in ComponentName admin, in ComponentName target, in PersistableBundle bundle);













    PersistableBundle getTransferOwnershipBundle();































    void setStartUserSessionMessage(in ComponentName admin, in CharSequence startUserSessionMessage);















    void setEndUserSessionMessage(in ComponentName admin, in CharSequence endUserSessionMessage);

































core/res/AndroidManifest.xml



+1
−0






























Original line number
Diff line number
Diff line








@@ -578,6 +578,7 @@













    <!-- Added in P -->















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















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













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















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































    <!-- ====================================================================== -->