diff options
| author | Kenny Root <kroot@google.com> | 2010-10-13 15:43:35 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2010-10-13 15:43:51 -0700 |
| commit | 0a9b54e88b9cbb30748b5f0b331aec3f3ef8d639 (patch) | |
| tree | 22ff1466c777067596537ccb085cd64ed0bc3bc5 /api | |
| parent | 0726fd9e835579019f6b23ab50d7b45401e11dbe (diff) | |
| parent | 8bb7a1dfbb43dda49fb3c4f86181bcd7f969a832 (diff) | |
| download | frameworks_base-0a9b54e88b9cbb30748b5f0b331aec3f3ef8d639.zip frameworks_base-0a9b54e88b9cbb30748b5f0b331aec3f3ef8d639.tar.gz frameworks_base-0a9b54e88b9cbb30748b5f0b331aec3f3ef8d639.tar.bz2 | |
resolved conflicts for merge of 8bb7a1df to master
Change-Id: Ieec036f494a54eab74a27b954d1423bf981dd3f9
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.xml | 92 |
1 files changed, 89 insertions, 3 deletions
diff --git a/api/current.xml b/api/current.xml index d517325..72e20f4 100644 --- a/api/current.xml +++ b/api/current.xml @@ -143602,9 +143602,97 @@ > <parameter name="path" type="java.lang.String"> </parameter> -<parameter name="state" type="java.lang.String"> +<parameter name="state" type="int"> </parameter> </method> +<field name="ERROR_ALREADY_MOUNTED" + type="int" + transient="false" + volatile="false" + value="24" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ERROR_COULD_NOT_MOUNT" + type="int" + transient="false" + volatile="false" + value="21" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ERROR_COULD_NOT_UNMOUNT" + type="int" + transient="false" + volatile="false" + value="22" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ERROR_INTERNAL" + type="int" + transient="false" + volatile="false" + value="20" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ERROR_NOT_MOUNTED" + type="int" + transient="false" + volatile="false" + value="23" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ERROR_PERMISSION_DENIED" + type="int" + transient="false" + volatile="false" + value="25" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MOUNTED" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="UNMOUNTED" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> <class name="StorageEventListener" extends="java.lang.Object" @@ -143708,8 +143796,6 @@ > <parameter name="filename" type="java.lang.String"> </parameter> -<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException"> -</exception> </method> <method name="isUsbMassStorageConnected" return="boolean" |