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

Commit 586da02e authored by Rubin Xu's avatar Rubin Xu Committed by android-build-merger
Browse files

Merge "Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two." into nyc-dev 

am: 63d1ee45

* commit '63d1ee45':
  Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two.

Change-Id: Iab160ad25bafd8850ea75fa8575b12466bf9e16b
parents 22413d10 63d1ee45

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -8523,8 +8523,9 @@ package android.content { 
    field public static final java.lang.String ACTION_LOCKED_BOOT_COMPLETED = "android.intent.action.LOCKED_BOOT_COMPLETED";

    field public static final java.lang.String ACTION_MAIN = "android.intent.action.MAIN";

    field public static final java.lang.String ACTION_MANAGED_PROFILE_ADDED = "android.intent.action.MANAGED_PROFILE_ADDED";

    field public static final java.lang.String ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED = "android.intent.action.MANAGED_PROFILE_AVAILABILITY_CHANGED";

    field public static final java.lang.String ACTION_MANAGED_PROFILE_AVAILABLE = "android.intent.action.MANAGED_PROFILE_AVAILABLE";

    field public static final java.lang.String ACTION_MANAGED_PROFILE_REMOVED = "android.intent.action.MANAGED_PROFILE_REMOVED";

    field public static final java.lang.String ACTION_MANAGED_PROFILE_UNAVAILABLE = "android.intent.action.MANAGED_PROFILE_UNAVAILABLE";

    field public static final java.lang.String ACTION_MANAGED_PROFILE_UNLOCKED = "android.intent.action.MANAGED_PROFILE_UNLOCKED";

    field public static final java.lang.String ACTION_MANAGE_NETWORK_USAGE = "android.intent.action.MANAGE_NETWORK_USAGE";

    field public static final java.lang.String ACTION_MANAGE_PACKAGE_STORAGE = "android.intent.action.MANAGE_PACKAGE_STORAGE";

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -8839,8 +8839,9 @@ package android.content { 
    field public static final java.lang.String ACTION_LOCKED_BOOT_COMPLETED = "android.intent.action.LOCKED_BOOT_COMPLETED";

    field public static final java.lang.String ACTION_MAIN = "android.intent.action.MAIN";

    field public static final java.lang.String ACTION_MANAGED_PROFILE_ADDED = "android.intent.action.MANAGED_PROFILE_ADDED";

    field public static final java.lang.String ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED = "android.intent.action.MANAGED_PROFILE_AVAILABILITY_CHANGED";

    field public static final java.lang.String ACTION_MANAGED_PROFILE_AVAILABLE = "android.intent.action.MANAGED_PROFILE_AVAILABLE";

    field public static final java.lang.String ACTION_MANAGED_PROFILE_REMOVED = "android.intent.action.MANAGED_PROFILE_REMOVED";

    field public static final java.lang.String ACTION_MANAGED_PROFILE_UNAVAILABLE = "android.intent.action.MANAGED_PROFILE_UNAVAILABLE";

    field public static final java.lang.String ACTION_MANAGED_PROFILE_UNLOCKED = "android.intent.action.MANAGED_PROFILE_UNLOCKED";

    field public static final java.lang.String ACTION_MANAGE_NETWORK_USAGE = "android.intent.action.MANAGE_NETWORK_USAGE";

    field public static final java.lang.String ACTION_MANAGE_PACKAGE_STORAGE = "android.intent.action.MANAGE_PACKAGE_STORAGE";

api/test-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -8530,8 +8530,9 @@ package android.content { 
    field public static final java.lang.String ACTION_LOCKED_BOOT_COMPLETED = "android.intent.action.LOCKED_BOOT_COMPLETED";

    field public static final java.lang.String ACTION_MAIN = "android.intent.action.MAIN";

    field public static final java.lang.String ACTION_MANAGED_PROFILE_ADDED = "android.intent.action.MANAGED_PROFILE_ADDED";

    field public static final java.lang.String ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED = "android.intent.action.MANAGED_PROFILE_AVAILABILITY_CHANGED";

    field public static final java.lang.String ACTION_MANAGED_PROFILE_AVAILABLE = "android.intent.action.MANAGED_PROFILE_AVAILABLE";

    field public static final java.lang.String ACTION_MANAGED_PROFILE_REMOVED = "android.intent.action.MANAGED_PROFILE_REMOVED";

    field public static final java.lang.String ACTION_MANAGED_PROFILE_UNAVAILABLE = "android.intent.action.MANAGED_PROFILE_UNAVAILABLE";

    field public static final java.lang.String ACTION_MANAGED_PROFILE_UNLOCKED = "android.intent.action.MANAGED_PROFILE_UNLOCKED";

    field public static final java.lang.String ACTION_MANAGE_NETWORK_USAGE = "android.intent.action.MANAGE_NETWORK_USAGE";

    field public static final java.lang.String ACTION_MANAGE_PACKAGE_STORAGE = "android.intent.action.MANAGE_PACKAGE_STORAGE";

core/java/android/content/Intent.java

+21 −4
Original line number Diff line number Diff line
@@ -3056,15 +3056,29 @@ 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's availability has

     * changed. This includes when the user toggles the profile's quiet mode. Carries an extra

     * 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

     * {@link #EXTRA_USER} that specifies the UserHandle of the profile. When quiet mode is changed,

     * this broadcast will carry a boolean extra {@link #EXTRA_QUIET_MODE} indicating the new state

     * of quiet mode. This is only sent to registered receivers, not manifest receivers.

     */

    public static final String ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED =

            "android.intent.action.MANAGED_PROFILE_AVAILABILITY_CHANGED";

    public static final String ACTION_MANAGED_PROFILE_AVAILABLE =

            "android.intent.action.MANAGED_PROFILE_AVAILABLE";



    /**

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

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

     * {@link #EXTRA_USER} that specifies the UserHandle of the profile. When quiet mode is changed,

     * this broadcast will carry a boolean extra {@link #EXTRA_QUIET_MODE} indicating the new state

     * of quiet mode. This is only sent to registered receivers, not manifest receivers.

     */

    public static final String ACTION_MANAGED_PROFILE_UNAVAILABLE =

            "android.intent.action.MANAGED_PROFILE_UNAVAILABLE";



    /**

     * Sent when the user taps on the clock widget in the system's "quick settings" area.
@@ -4165,6 +4179,9 @@ public class Intent implements Parcelable, Cloneable { 


    /**

     * Optional boolean extra indicating whether quiet mode has been switched on or off.

     * When a profile goes into quiet mode, all apps in the profile are killed and the

     * profile user is stopped. Widgets originating from the profile are masked, and app

     * launcher icons are grayed out.

     */

    public static final String EXTRA_QUIET_MODE = "android.intent.extra.QUIET_MODE";

core/res/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -348,6 +348,8 @@ 
    <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" />