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

Commit 3f5478a3 authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge changes I121b9246,Ib8227067 

* changes:
  AndroidManifest.xml: Mark NETWORK_SETTINGS_RESET broadcast as protected
  Intent: Promote broadcast flag needed by wifi to @SystemApi
parents 40d1c39d 6769c541

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1781,6 +1781,7 @@ package android.content { 
    field @Deprecated public static final String EXTRA_SIM_STATE = "ss";

    field public static final String EXTRA_UNKNOWN_INSTANT_APP = "android.intent.extra.UNKNOWN_INSTANT_APP";

    field public static final String EXTRA_VERIFICATION_BUNDLE = "android.intent.extra.VERIFICATION_BUNDLE";

    field public static final int FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT = 67108864; // 0x4000000

    field public static final String METADATA_SETUP_VERSION = "android.SETUP_VERSION";

    field @Deprecated public static final String SIM_ABSENT_ON_PERM_DISABLED = "PERM_DISABLED";

    field @Deprecated public static final String SIM_LOCKED_NETWORK = "NETWORK";

core/java/android/content/Intent.java

+7 −4
Original line number Diff line number Diff line
@@ -6440,19 +6440,22 @@ public class Intent implements Parcelable, Cloneable { 
     */

    public static final int FLAG_RECEIVER_NO_ABORT = 0x08000000;

    /**

     * If set, when sending a broadcast <i>before boot has completed</i> only

     * If set, when sending a broadcast <i>before the system has fully booted up

     * (which is even before {@link #ACTION_LOCKED_BOOT_COMPLETED} has been sent)"</i> only

     * registered receivers will be called -- no BroadcastReceiver components

     * will be launched.  Sticky intent state will be recorded properly even

     * if no receivers wind up being called.  If {@link #FLAG_RECEIVER_REGISTERED_ONLY}

     * is specified in the broadcast intent, this flag is unnecessary.

     *

     * <p>This flag is only for use by system sevices as a convenience to

     * avoid having to implement a more complex mechanism around detection

     * <p>This flag is only for use by system services (even services from mainline modules) as a

     * convenience to avoid having to implement a more complex mechanism around detection

     * of boot completion.

     *

     * <p>This is useful to system server mainline modules

     *

     * @hide

     */

    @UnsupportedAppUsage

    @SystemApi

    public static final int FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT = 0x04000000;

    /**

     * Set when this broadcast is for a boot upgrade, a special mode that

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@ 
    <protected-broadcast android:name="android.net.wifi.STATE_CHANGE" />

    <protected-broadcast android:name="android.net.wifi.LINK_CONFIGURATION_CHANGED" />

    <protected-broadcast android:name="android.net.wifi.CONFIGURED_NETWORKS_CHANGE" />

    <protected-broadcast android:name="android.net.wifi.action.NETWORK_SETTINGS_RESET" />

    <protected-broadcast android:name="android.net.wifi.action.PASSPOINT_DEAUTH_IMMINENT" />

    <protected-broadcast android:name="android.net.wifi.action.PASSPOINT_ICON" />

    <protected-broadcast android:name="android.net.wifi.action.PASSPOINT_OSU_PROVIDERS_LIST" />