Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

Browse Source 
Automated import of CL 144245
This commit is contained in:
Wink Saville
2009-04-02 11:00:54 -07:00
committed by The Android Open Source Project
parent 3afdd56470
commit 04e71b3db8
189 changed files with 24484 additions and 8162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
api/current.xml
View File

@@ -10263,6 +10263,28 @@
visibility="public"
>
</field>
<field name="stat_sys_vp_phone_call"
type="int"
transient="false"
volatile="false"
value="17302061"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="stat_sys_vp_phone_call_on_hold"
type="int"
transient="false"
volatile="false"
value="17302062"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="stat_sys_warning"
type="int"
transient="false"
@@ -97845,7 +97867,7 @@
abstract="false"
static="false"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
<method name="divideMessage"
@@ -97854,8 +97876,8 @@
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
final="true"
deprecated="deprecated"
visibility="public"
>
<parameter name="text" type="java.lang.String">
@@ -97867,8 +97889,8 @@
native="false"
synchronized="false"
static="true"
final="false"
deprecated="not deprecated"
final="true"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -97878,8 +97900,8 @@
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
final="true"
deprecated="deprecated"
visibility="public"
>
<parameter name="destinationAddress" type="java.lang.String">
@@ -97901,8 +97923,8 @@
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
final="true"
deprecated="deprecated"
visibility="public"
>
<parameter name="destinationAddress" type="java.lang.String">
@@ -97922,8 +97944,8 @@
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
final="true"
deprecated="deprecated"
visibility="public"
>
<parameter name="destinationAddress" type="java.lang.String">
@@ -97944,7 +97966,7 @@
value="1"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -97955,7 +97977,7 @@
value="4"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -97966,7 +97988,7 @@
value="3"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -97977,7 +97999,7 @@
value="2"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -97988,7 +98010,7 @@
value="0"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -97999,7 +98021,7 @@
value="1"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -98010,7 +98032,7 @@
value="5"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -98021,7 +98043,7 @@
value="3"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -98032,7 +98054,7 @@
value="7"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -98042,14 +98064,14 @@
abstract="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
<constructor name="SmsMessage"
type="android.telephony.gsm.SmsMessage"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</constructor>
@@ -98060,7 +98082,7 @@
synchronized="false"
static="true"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
<parameter name="messageBody" type="java.lang.CharSequence">
@@ -98075,7 +98097,7 @@
synchronized="false"
static="true"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
<parameter name="messageBody" type="java.lang.String">
@@ -98090,7 +98112,7 @@
synchronized="false"
static="true"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
<parameter name="pdu" type="byte[]">
@@ -98103,7 +98125,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98114,7 +98136,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98125,7 +98147,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98136,7 +98158,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98147,7 +98169,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98158,7 +98180,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98169,7 +98191,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98180,7 +98202,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98191,7 +98213,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98202,7 +98224,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98213,7 +98235,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98224,7 +98246,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98235,7 +98257,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98246,7 +98268,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98257,7 +98279,7 @@
synchronized="false"
static="true"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
<parameter name="scAddress" type="java.lang.String">
@@ -98276,7 +98298,7 @@
synchronized="false"
static="true"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
<parameter name="scAddress" type="java.lang.String">
@@ -98297,7 +98319,7 @@
synchronized="false"
static="true"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
<parameter name="pdu" type="java.lang.String">
@@ -98310,7 +98332,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98321,7 +98343,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98332,7 +98354,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98343,7 +98365,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98354,7 +98376,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98365,7 +98387,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98376,7 +98398,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98387,7 +98409,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98398,7 +98420,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98409,7 +98431,7 @@
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</method>
@@ -98420,7 +98442,7 @@
value="3"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -98431,7 +98453,7 @@
value="1"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -98442,7 +98464,7 @@
value="2"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -98453,7 +98475,7 @@
value="0"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -98464,7 +98486,7 @@
value="140"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -98475,7 +98497,7 @@
value="160"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -98486,7 +98508,7 @@
value="153"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -98496,7 +98518,7 @@
abstract="false"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
<method name="valueOf"
@@ -98529,14 +98551,14 @@
abstract="false"
static="true"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
<constructor name="SmsMessage.SubmitPdu"
type="android.telephony.gsm.SmsMessage.SubmitPdu"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</constructor>
@@ -98547,7 +98569,7 @@
value="null"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -98558,7 +98580,7 @@
value="null"
static="false"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>