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

Commit ef2b37ea authored by Kenny Guy's avatar Kenny Guy Committed by Android (Google) Code Review
Browse files

Merge "Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only."

parents 2ae1019c d4b584ea

core/java/android/content/Intent.java

+7 −3
Original line number Diff line number Diff line
@@ -2656,7 +2656,9 @@ public class Intent implements Parcelable, Cloneable { 
    /**

     * Broadcast sent to the primary user when an associated managed profile is added (the profile

     * was created and is ready to be used). Carries an extra {@link #EXTRA_USER} that specifies

     * the UserHandle of the profile that was added. This is only sent to registered receivers,

     * the UserHandle of the profile that was added. Only applications (for example Launchers)

     * that need to display merged content across both primary and managed profiles need to

     * worry about this broadcast. This is only sent to registered receivers,

     * not manifest receivers.

     */

    public static final String ACTION_MANAGED_PROFILE_ADDED =
@@ -2664,8 +2666,10 @@ public class Intent implements Parcelable, Cloneable { 


    /**

     * Broadcast sent to the primary user when an associated managed profile is removed. Carries an

     * extra {@link #EXTRA_USER} that specifies the UserHandle of the profile that was removed. This

     * is only sent to registered receivers, not manifest receivers.

     * extra {@link #EXTRA_USER} that specifies the UserHandle of the profile that was removed.

     * Only applications (for example Launchers) that need to display merged content across both

     * primary and managed profiles need to worry about this broadcast. This is only sent to

     * registered receivers, not manifest receivers.

     */

    public static final String ACTION_MANAGED_PROFILE_REMOVED =

            "android.intent.action.MANAGED_PROFILE_REMOVED";

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

+2 −1
Original line number Diff line number Diff line
@@ -1273,7 +1273,8 @@ public class UserManagerService extends IUserManager.Stub { 


    private void sendProfileRemovedBroadcast(int parentUserId, int removedUserId) {

        Intent managedProfileIntent = new Intent(Intent.ACTION_MANAGED_PROFILE_REMOVED);

        managedProfileIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

        managedProfileIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY |

                Intent.FLAG_RECEIVER_FOREGROUND);

        managedProfileIntent.putExtra(Intent.EXTRA_USER, new UserHandle(removedUserId));

        mContext.sendBroadcastAsUser(managedProfileIntent, new UserHandle(parentUserId), null);

    }