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

Commit b40667ec authored by Rubin Xu's avatar Rubin Xu Committed by Android (Google) Code Review
Browse files

Merge "Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast" into nyc-dev

parents ff0ff67e 19c2a57c

core/java/android/content/Intent.java

+0 −4
Original line number Diff line number Diff line
@@ -3078,10 +3078,6 @@ public class Intent implements Parcelable, Cloneable { 
    public static final String ACTION_MANAGED_PROFILE_UNLOCKED =

            "android.intent.action.MANAGED_PROFILE_UNLOCKED";



    /** @hide */

    public static final String ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED =

            "android.intent.action.MANAGED_PROFILE_AVAILABILITY_CHANGED";



    /**

     * Broadcast sent to the primary user when an associated managed profile has become available.

     * Currently this includes when the user disables quiet mode for the profile. Carries an extra

core/res/AndroidManifest.xml

+0 −4
Original line number Diff line number Diff line
@@ -347,10 +347,6 @@ 
    <protected-broadcast android:name="android.app.action.SYSTEM_UPDATE_POLICY_CHANGED" />

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



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

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

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



    <!-- Added in N -->

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

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

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

+0 −9
Original line number Diff line number Diff line
@@ -632,15 +632,6 @@ public class UserManagerService extends IUserManager.Stub { 
        intent.putExtra(Intent.EXTRA_USER_HANDLE, profileHandle.getIdentifier());

        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);

        mContext.sendBroadcastAsUser(intent, parentHandle);



        //TODO: remove once Launcher3 is updated.

        Intent oldIntent = new Intent(Intent.ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED);

        oldIntent.putExtra(Intent.EXTRA_QUIET_MODE, inQuietMode);

        oldIntent.putExtra(Intent.EXTRA_USER, profileHandle);

        oldIntent.putExtra(Intent.EXTRA_USER_HANDLE, profileHandle.getIdentifier());

        oldIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);

        mContext.sendBroadcastAsUser(oldIntent, parentHandle);



    }



    @Override