diff options
| author | Suchi Amalapurapu <asuchitra@google.com> | 2010-04-20 15:08:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-20 15:08:50 -0700 |
| commit | d32f942280cc4390ab853321557eef06292b300e (patch) | |
| tree | 9d513084bcfb45f763275ba8e50fe280f622ef6b /api | |
| parent | 1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0 (diff) | |
| parent | 0dde41fbe0e36bfe059399c839604267ad0318c1 (diff) | |
| download | frameworks_base-d32f942280cc4390ab853321557eef06292b300e.zip frameworks_base-d32f942280cc4390ab853321557eef06292b300e.tar.gz frameworks_base-d32f942280cc4390ab853321557eef06292b300e.tar.bz2 | |
am 0dde41fb: Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo
Merge commit '0dde41fbe0e36bfe059399c839604267ad0318c1' into froyo-plus-aosp
* commit '0dde41fbe0e36bfe059399c839604267ad0318c1':
Fix 2610961
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.xml | 46 |
1 files changed, 45 insertions, 1 deletions
diff --git a/api/current.xml b/api/current.xml index ded3d3b..87df0ba 100644 --- a/api/current.xml +++ b/api/current.xml @@ -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=""android.intent.action.EXTERNAL_APPLICATIONS_AVAILABLE"" + 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=""android.intent.action.EXTERNAL_APPLICATIONS_UNAVAILABLE"" + 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=""android.intent.extra.changed_package_list"" + 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=""android.intent.extra.changed_uid_list"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="EXTRA_DATA_REMOVED" type="java.lang.String" transient="false" |