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

Commit e9a953fa authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Add a receiver exported flag to mark unaudited runtime receivers"

parents bf06e737 7970fff4

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -699,6 +699,7 @@ package android.content { 
    field public static final String FONT_SERVICE = "font";

    field public static final String POWER_EXEMPTION_SERVICE = "power_exemption";

    field @Deprecated public static final String POWER_WHITELIST_MANAGER = "power_whitelist";

    field @Deprecated public static final int RECEIVER_EXPORTED_UNAUDITED = 2; // 0x2

    field public static final String TEST_NETWORK_SERVICE = "test_network";

  }

core/java/android/content/Context.java

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


    /** @hide */

    @IntDef(flag = true, prefix = { "RECEIVER_VISIBLE" }, value = {

            RECEIVER_VISIBLE_TO_INSTANT_APPS, RECEIVER_EXPORTED, RECEIVER_NOT_EXPORTED

            RECEIVER_VISIBLE_TO_INSTANT_APPS, RECEIVER_EXPORTED, RECEIVER_NOT_EXPORTED,

            RECEIVER_EXPORTED_UNAUDITED

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface RegisterReceiverFlags {}
@@ -550,6 +551,14 @@ public abstract class Context { 
     */

    public static final int RECEIVER_EXPORTED = 0x2;



    /**

     * @deprecated Use {@link #RECEIVER_NOT_EXPORTED} or {@link #RECEIVER_EXPORTED} instead.

     * @hide

     */

    @Deprecated

    @TestApi

    public static final int RECEIVER_EXPORTED_UNAUDITED = RECEIVER_EXPORTED;



    /**

     * Flag for {@link #registerReceiver}: The receiver cannot receive broadcasts from other Apps.

     * Has the same behavior as marking a statically registered receiver with "exported=false"