Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '0dde41fbe0e36bfe059399c839604267ad0318c1' into froyo-plus-aosp

* commit '0dde41fbe0e36bfe059399c839604267ad0318c1':
  Fix 2610961
This commit is contained in:
Suchi Amalapurapu
2010-04-20 15:08:50 -07:00
committed by Android Git Automerger
parent 1e1edb2c73 0dde41fbe0
commit d32f942280
2 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
api/current.xml
View File

@@ -27144,7 +27144,7 @@
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<parameter name="fd" type="android.os.ParcelFileDescriptor"> <parameter name="newState" type="android.os.ParcelFileDescriptor">
</parameter> </parameter>
</method> </method>
</interface> </interface>
@@ -37923,6 +37923,28 @@
visibility="public" visibility="public"
> >
</field> </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" <field name="ACTION_FACTORY_TEST"
type="java.lang.String" type="java.lang.String"
transient="false" transient="false"
@@ -38890,6 +38912,28 @@
visibility="public" visibility="public"
> >
</field> </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" <field name="EXTRA_DATA_REMOVED"
type="java.lang.String" type="java.lang.String"
transient="false" transient="false"

4
core/java/android/content/Intent.java
View File

@@ -1395,7 +1395,6 @@ public class Intent implements Parcelable, Cloneable {
* *
* <p class="note">This is a protected intent that can only be sent * <p class="note">This is a protected intent that can only be sent
* by the system. * by the system.
* @hide
*/ */
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_EXTERNAL_APPLICATIONS_AVAILABLE = 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 * <p class="note">This is a protected intent that can only be sent
* by the system. * by the system.
* @hide
*/ */
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE = 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_AVAILABLE},
* {@link android.content.Intent#ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE} * {@link android.content.Intent#ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE}
* and contains a string array of all of the components that have changed. * and contains a string array of all of the components that have changed.
* @hide
*/ */
public static final String EXTRA_CHANGED_PACKAGE_LIST = public static final String EXTRA_CHANGED_PACKAGE_LIST =
"android.intent.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} * {@link android.content.Intent#ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE}
* and contains an integer array of uids of all of the components * and contains an integer array of uids of all of the components
* that have changed. * that have changed.
* @hide
*/ */
public static final String EXTRA_CHANGED_UID_LIST = public static final String EXTRA_CHANGED_UID_LIST =
"android.intent.extra.changed_uid_list"; "android.intent.extra.changed_uid_list";