summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Howard <showard@google.com>2010-09-30 14:53:09 -0700
committerSteve Howard <showard@google.com>2010-09-30 14:57:21 -0700
commit83129bba368d6f50d3e0920b8574611a741bed56 (patch)
tree1f58fe9a1bb45f12204ff0380f34185f654a7da1
parentee0fc045dadc65de67af41dc26223dbffc87a574 (diff)
downloadframeworks_base-83129bba368d6f50d3e0920b8574611a741bed56.zip
frameworks_base-83129bba368d6f50d3e0920b8574611a741bed56.tar.gz
frameworks_base-83129bba368d6f50d3e0920b8574611a741bed56.tar.bz2
Updated current.xml as autogenerated
My previous change included a manually-edited version of current.xml to get the build fixed. This change includes an equivalent file as generated by update-api, so that the next person won't see a bunch of unexpected diffs. Change-Id: Ia244d90248ec54ddfa3b7344c09720c56ff201e3
-rw-r--r--api/current.xml56
1 files changed, 28 insertions, 28 deletions
diff --git a/api/current.xml b/api/current.xml
index bd86412..403820d 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -28771,55 +28771,55 @@
visibility="public"
>
</field>
-<field name="COLUMN_REASON"
+<field name="COLUMN_ID"
type="java.lang.String"
transient="false"
volatile="false"
- value="&quot;reason&quot;"
+ value="&quot;_id&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
-<field name="COLUMN_ID"
+<field name="COLUMN_LAST_MODIFIED_TIMESTAMP"
type="java.lang.String"
transient="false"
volatile="false"
- value="&quot;_id&quot;"
+ value="&quot;last_modified_timestamp&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
-<field name="COLUMN_LAST_MODIFIED_TIMESTAMP"
+<field name="COLUMN_LOCAL_URI"
type="java.lang.String"
transient="false"
volatile="false"
- value="&quot;last_modified_timestamp&quot;"
+ value="&quot;local_uri&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
-<field name="COLUMN_LOCAL_URI"
+<field name="COLUMN_MEDIA_TYPE"
type="java.lang.String"
transient="false"
volatile="false"
- value="&quot;local_uri&quot;"
+ value="&quot;media_type&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
-<field name="COLUMN_MEDIA_TYPE"
+<field name="COLUMN_REASON"
type="java.lang.String"
transient="false"
volatile="false"
- value="&quot;media_type&quot;"
+ value="&quot;reason&quot;"
static="true"
final="true"
deprecated="not deprecated"
@@ -28980,18 +28980,18 @@
visibility="public"
>
</field>
-<field name="STATUS_FAILED"
+<field name="PAUSED_QUEUED_FOR_WIFI"
type="int"
transient="false"
volatile="false"
- value="16"
+ value="3"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
-<field name="STATUS_PAUSED"
+<field name="PAUSED_UNKNOWN"
type="int"
transient="false"
volatile="false"
@@ -29002,77 +29002,77 @@
visibility="public"
>
</field>
-<field name="STATUS_PENDING"
+<field name="PAUSED_WAITING_FOR_NETWORK"
type="int"
transient="false"
volatile="false"
- value="1"
+ value="2"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
-<field name="STATUS_RUNNING"
+<field name="PAUSED_WAITING_TO_RETRY"
type="int"
transient="false"
volatile="false"
- value="2"
+ value="1"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
-<field name="STATUS_SUCCESSFUL"
+<field name="STATUS_FAILED"
type="int"
transient="false"
volatile="false"
- value="8"
+ value="16"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
-<field name="PAUSED_WAITING_TO_RETRY"
+<field name="STATUS_PAUSED"
type="int"
transient="false"
volatile="false"
- value="1"
+ value="4"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
-<field name="PAUSED_WAITING_FOR_NETWORK"
+<field name="STATUS_PENDING"
type="int"
transient="false"
volatile="false"
- value="2"
+ value="1"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
-<field name="PAUSED_QUEUED_FOR_WIFI"
+<field name="STATUS_RUNNING"
type="int"
transient="false"
volatile="false"
- value="3"
+ value="2"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
-<field name="PAUSED_UNKNOWN"
+<field name="STATUS_SUCCESSFUL"
type="int"
transient="false"
volatile="false"
- value="4"
+ value="8"
static="true"
final="true"
deprecated="not deprecated"
@@ -241716,7 +241716,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="arg0" type="T">
+<parameter name="t" type="T">
</parameter>
</method>
</interface>