diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-10 07:50:30 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-10 07:50:30 -0800 |
| commit | cc08c439bc7b0afbdafc5ca18c584d2f7724f3df (patch) | |
| tree | 219bad973dd1af80c377bb8e9e5355e70b843bac /api | |
| parent | 3de30a4c1e48d92af14154abddd4fb6fe0c6aa13 (diff) | |
| parent | ac36d7c715a9cd793b2dce6de547594810101c3a (diff) | |
| download | frameworks_base-cc08c439bc7b0afbdafc5ca18c584d2f7724f3df.zip frameworks_base-cc08c439bc7b0afbdafc5ca18c584d2f7724f3df.tar.gz frameworks_base-cc08c439bc7b0afbdafc5ca18c584d2f7724f3df.tar.bz2 | |
Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/api/current.xml b/api/current.xml index e3745a3..ace309b 100644 --- a/api/current.xml +++ b/api/current.xml @@ -94415,6 +94415,17 @@ visibility="public" > </method> +<method name="getDescription" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getManufacturer" return="java.lang.String" abstract="false" @@ -94437,7 +94448,7 @@ visibility="public" > </method> -<method name="getType" +<method name="getUri" return="java.lang.String" abstract="false" native="false" |