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

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

Merge "Turn off profile by stopping the user."

parents a3a1ea3d f13c9801

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -8373,7 +8373,6 @@ package android.content { 
    field public static final java.lang.String ACTION_APP_ERROR = "android.intent.action.APP_ERROR";

    field public static final java.lang.String ACTION_ASSIST = "android.intent.action.ASSIST";

    field public static final java.lang.String ACTION_ATTACH_DATA = "android.intent.action.ATTACH_DATA";

    field public static final java.lang.String ACTION_AVAILABILITY_CHANGED = "android.intent.action.AVAILABILITY_CHANGED";

    field public static final java.lang.String ACTION_BATTERY_CHANGED = "android.intent.action.BATTERY_CHANGED";

    field public static final java.lang.String ACTION_BATTERY_LOW = "android.intent.action.BATTERY_LOW";

    field public static final java.lang.String ACTION_BATTERY_OKAY = "android.intent.action.BATTERY_OKAY";

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -8672,7 +8672,6 @@ package android.content { 
    field public static final java.lang.String ACTION_APP_ERROR = "android.intent.action.APP_ERROR";

    field public static final java.lang.String ACTION_ASSIST = "android.intent.action.ASSIST";

    field public static final java.lang.String ACTION_ATTACH_DATA = "android.intent.action.ATTACH_DATA";

    field public static final java.lang.String ACTION_AVAILABILITY_CHANGED = "android.intent.action.AVAILABILITY_CHANGED";

    field public static final java.lang.String ACTION_BATTERY_CHANGED = "android.intent.action.BATTERY_CHANGED";

    field public static final java.lang.String ACTION_BATTERY_LOW = "android.intent.action.BATTERY_LOW";

    field public static final java.lang.String ACTION_BATTERY_OKAY = "android.intent.action.BATTERY_OKAY";

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -8378,7 +8378,6 @@ package android.content { 
    field public static final java.lang.String ACTION_APP_ERROR = "android.intent.action.APP_ERROR";

    field public static final java.lang.String ACTION_ASSIST = "android.intent.action.ASSIST";

    field public static final java.lang.String ACTION_ATTACH_DATA = "android.intent.action.ATTACH_DATA";

    field public static final java.lang.String ACTION_AVAILABILITY_CHANGED = "android.intent.action.AVAILABILITY_CHANGED";

    field public static final java.lang.String ACTION_BATTERY_CHANGED = "android.intent.action.BATTERY_CHANGED";

    field public static final java.lang.String ACTION_BATTERY_LOW = "android.intent.action.BATTERY_LOW";

    field public static final java.lang.String ACTION_BATTERY_OKAY = "android.intent.action.BATTERY_OKAY";

core/java/android/content/Intent.java

+4 −16
Original line number Diff line number Diff line
@@ -3032,26 +3032,14 @@ public class Intent implements Parcelable, Cloneable { 


    /**

     * 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, or when the profile

     * owner suspends 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.

     * changed. This includes when the user toggles the profile's quiet mode. 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";



    /**

     * Broadcast sent to the managed profile when its availability has changed. This includes when

     * the user toggles the profile's quiet mode, or when the profile owner suspends 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. See also

     * {@link #ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED}

     */

    public static final String ACTION_AVAILABILITY_CHANGED =

            "android.intent.action.AVAILABILITY_CHANGED";



    /**

     * Sent when the user taps on the clock widget in the system's "quick settings" area.

     */

core/res/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -339,7 +339,6 @@ 
    <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.AVAILABILITY_CHANGED" />



    <!-- Added in N -->

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