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

Commit d32f9422 authored by Suchi Amalapurapu's avatar Suchi Amalapurapu Committed by Android Git Automerger
Browse files

am 0dde41fb: Merge "Fix 2610961 Unhide broadcast intents that are sent when... 

am 0dde41fb: Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo

Merge commit '0dde41fb' into froyo-plus-aosp

* commit '0dde41fb':
  Fix 2610961
parents 1e1edb2c 0dde41fb

api/current.xml

+45 −1
Original line number Diff line number Diff line
@@ -27144,7 +27144,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="fd" type="android.os.ParcelFileDescriptor">

<parameter name="newState" type="android.os.ParcelFileDescriptor">

</parameter>

</method>

</interface>
@@ -37923,6 +37923,28 @@ 
 visibility="public"

>

</field>

<field name="ACTION_EXTERNAL_APPLICATIONS_AVAILABLE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.intent.action.EXTERNAL_APPLICATIONS_AVAILABLE&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.intent.action.EXTERNAL_APPLICATIONS_UNAVAILABLE&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ACTION_FACTORY_TEST"

 type="java.lang.String"

 transient="false"
@@ -38890,6 +38912,28 @@ 
 visibility="public"

>

</field>

<field name="EXTRA_CHANGED_PACKAGE_LIST"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.intent.extra.changed_package_list&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="EXTRA_CHANGED_UID_LIST"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.intent.extra.changed_uid_list&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="EXTRA_DATA_REMOVED"

 type="java.lang.String"

 transient="false"

core/java/android/content/Intent.java

+0 −4
Original line number Diff line number Diff line
@@ -1395,7 +1395,6 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * <p class="note">This is a protected intent that can only be sent

     * by the system.

     * @hide

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_EXTERNAL_APPLICATIONS_AVAILABLE =
@@ -1420,7 +1419,6 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * <p class="note">This is a protected intent that can only be sent

     * by the system.

     * @hide

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE =
@@ -2243,7 +2241,6 @@ public class Intent implements Parcelable, Cloneable { 
     * {@link android.content.Intent#ACTION_EXTERNAL_APPLICATIONS_AVAILABLE},

     * {@link android.content.Intent#ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE}

     * and contains a string array of all of the components that have changed.

     * @hide

     */

    public static final String EXTRA_CHANGED_PACKAGE_LIST =

            "android.intent.extra.changed_package_list";
@@ -2254,7 +2251,6 @@ public class Intent implements Parcelable, Cloneable { 
     * {@link android.content.Intent#ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE}

     * and contains an integer array of uids of all of the components

     * that have changed.

     * @hide

     */

    public static final String EXTRA_CHANGED_UID_LIST =

            "android.intent.extra.changed_uid_list";