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

Commit 072ef562 authored by Gavin Corkery's avatar Gavin Corkery Committed by Android (Google) Code Review
Browse files

Merge "Move REBOOT_READY broadcast into android.scheduling" into sc-dev

parents 9200a223 abc70c25

core/api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -2370,7 +2370,6 @@ package android.content { 
    field public static final String ACTION_PENDING_INCIDENT_REPORTS_CHANGED = "android.intent.action.PENDING_INCIDENT_REPORTS_CHANGED";

    field public static final String ACTION_PRE_BOOT_COMPLETED = "android.intent.action.PRE_BOOT_COMPLETED";

    field public static final String ACTION_QUERY_PACKAGE_RESTART = "android.intent.action.QUERY_PACKAGE_RESTART";

    field public static final String ACTION_REBOOT_READY = "android.intent.action.REBOOT_READY";

    field public static final String ACTION_RESOLVE_INSTANT_APP_PACKAGE = "android.intent.action.RESOLVE_INSTANT_APP_PACKAGE";

    field @RequiresPermission(android.Manifest.permission.REVIEW_ACCESSIBILITY_SERVICES) public static final String ACTION_REVIEW_ACCESSIBILITY_SERVICES = "android.intent.action.REVIEW_ACCESSIBILITY_SERVICES";

    field @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS) public static final String ACTION_REVIEW_ONGOING_PERMISSION_USAGE = "android.intent.action.REVIEW_ONGOING_PERMISSION_USAGE";
@@ -2398,7 +2397,6 @@ package android.content { 
    field public static final String EXTRA_INSTANT_APP_HOSTNAME = "android.intent.extra.INSTANT_APP_HOSTNAME";

    field public static final String EXTRA_INSTANT_APP_SUCCESS = "android.intent.extra.INSTANT_APP_SUCCESS";

    field public static final String EXTRA_INSTANT_APP_TOKEN = "android.intent.extra.INSTANT_APP_TOKEN";

    field public static final String EXTRA_IS_READY_TO_REBOOT = "android.intent.extra.IS_READY_TO_REBOOT";

    field public static final String EXTRA_LONG_VERSION_CODE = "android.intent.extra.LONG_VERSION_CODE";

    field public static final String EXTRA_ORIGINATING_UID = "android.intent.extra.ORIGINATING_UID";

    field public static final String EXTRA_PACKAGES = "android.intent.extra.PACKAGES";

core/java/android/content/Context.java

+1 −1
Original line number Diff line number Diff line
@@ -4839,7 +4839,7 @@ public abstract class Context { 


    /**

     * Use with {@link #getSystemService(String)} to retrieve an

     * {@link android.scheduling.RebootReadinessManagerService} for communicating

     * {@link android.scheduling.RebootReadinessManager} for communicating

     * with the reboot readiness detector.

     *

     * @see #getSystemService(String)

core/java/android/content/Intent.java

+0 −25
Original line number Diff line number Diff line
@@ -4841,31 +4841,6 @@ public class Intent implements Parcelable, Cloneable { 
    public static final String ACTION_PACKAGE_NEEDS_INTEGRITY_VERIFICATION =

            "android.intent.action.PACKAGE_NEEDS_INTEGRITY_VERIFICATION";



    /**

     * Broadcast Action: Indicates that the device's reboot readiness has changed.

     *

     * <p>This broadcast will be sent with an extra that indicates whether or not the device is

     * ready to reboot.

     * <p>

     * The receiver <em>must</em> have the {@link android.Manifest.permission#REBOOT} permission.

     * <p class="note">

     * This is a protected intent that can only be sent by the system.

     *

     * @see #EXTRA_IS_READY_TO_REBOOT

     * @hide

     */

    @SystemApi

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_REBOOT_READY = "android.intent.action.REBOOT_READY";



    /**

     * A boolean extra used with {@link #ACTION_REBOOT_READY} which indicates if the

     * device is ready to reboot.

     * Will be {@code true} if ready to reboot, {@code false} otherwise.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_IS_READY_TO_REBOOT = "android.intent.extra.IS_READY_TO_REBOOT";



    // ---------------------------------------------------------------------

    // ---------------------------------------------------------------------

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ 
    <protected-broadcast android:name="com.android.internal.intent.action.BUGREPORT_REQUESTED" />



    <!-- Added in S -->

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

    <protected-broadcast android:name="android.scheduling.action.REBOOT_READY" />

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



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