summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-04-10 11:42:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-10 11:42:05 -0700
commit06af762033467bb578b9ed2be8af580cc11505a8 (patch)
treece245970c881ff1ff78b236c06e5c2b2205d9c7c /api
parent52ebff3c47eb3fcd43d0337a43312240f7d2010e (diff)
parent17de1532a950f7ee961debab93a7977292b7f1f3 (diff)
downloadframeworks_base-06af762033467bb578b9ed2be8af580cc11505a8.zip
frameworks_base-06af762033467bb578b9ed2be8af580cc11505a8.tar.gz
frameworks_base-06af762033467bb578b9ed2be8af580cc11505a8.tar.bz2
am 17de1532: Merge "Fix issue #2581524: Car home icon should always go to car home" into froyo
Merge commit '17de1532a950f7ee961debab93a7977292b7f1f3' into froyo-plus-aosp * commit '17de1532a950f7ee961debab93a7977292b7f1f3': Fix issue #2581524: Car home icon should always go to car home
Diffstat (limited to 'api')
-rw-r--r--api/current.xml31
1 files changed, 21 insertions, 10 deletions
diff --git a/api/current.xml b/api/current.xml
index 37736e3..61666ad 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -25428,6 +25428,17 @@
visibility="public"
>
</field>
+<field name="ENABLE_CAR_MODE_GO_CAR_HOME"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="MODE_NIGHT_AUTO"
type="int"
transient="false"
@@ -89029,7 +89040,7 @@
<method name="getMobileRxBytes"
return="long"
abstract="false"
- native="false"
+ native="true"
synchronized="false"
static="true"
final="false"
@@ -89040,7 +89051,7 @@
<method name="getMobileRxPackets"
return="long"
abstract="false"
- native="false"
+ native="true"
synchronized="false"
static="true"
final="false"
@@ -89051,7 +89062,7 @@
<method name="getMobileTxBytes"
return="long"
abstract="false"
- native="false"
+ native="true"
synchronized="false"
static="true"
final="false"
@@ -89062,7 +89073,7 @@
<method name="getMobileTxPackets"
return="long"
abstract="false"
- native="false"
+ native="true"
synchronized="false"
static="true"
final="false"
@@ -89073,7 +89084,7 @@
<method name="getTotalRxBytes"
return="long"
abstract="false"
- native="false"
+ native="true"
synchronized="false"
static="true"
final="false"
@@ -89084,7 +89095,7 @@
<method name="getTotalRxPackets"
return="long"
abstract="false"
- native="false"
+ native="true"
synchronized="false"
static="true"
final="false"
@@ -89095,7 +89106,7 @@
<method name="getTotalTxBytes"
return="long"
abstract="false"
- native="false"
+ native="true"
synchronized="false"
static="true"
final="false"
@@ -89106,7 +89117,7 @@
<method name="getTotalTxPackets"
return="long"
abstract="false"
- native="false"
+ native="true"
synchronized="false"
static="true"
final="false"
@@ -89117,7 +89128,7 @@
<method name="getUidRxBytes"
return="long"
abstract="false"
- native="false"
+ native="true"
synchronized="false"
static="true"
final="false"
@@ -89130,7 +89141,7 @@
<method name="getUidTxBytes"
return="long"
abstract="false"
- native="false"
+ native="true"
synchronized="false"
static="true"
final="false"