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

46
preloaded-classes
View File

@@ -298,8 +298,8 @@ android.telephony.PhoneNumberUtils
android.telephony.PhoneStateListener
android.telephony.ServiceState
android.telephony.TelephonyManager
android.telephony.gsm.SmsManager
android.telephony.gsm.SmsMessage
android.telephony.SmsManager
android.telephony.SmsMessage
android.text.AutoText
android.text.BoringLayout
android.text.BoringLayout$Metrics
@@ -451,17 +451,22 @@ android.view.animation.Transformation
android.view.inputmethod.BaseInputConnection
android.view.inputmethod.CompletionInfo
android.view.inputmethod.CompletionInfo$1
android.view.inputmethod.EditorInfo
android.view.inputmethod.EditorInfo$1
android.view.inputmethod.ExtractedText
android.view.inputmethod.ExtractedText$1
android.view.inputmethod.ExtractedTextRequest
android.view.inputmethod.ExtractedTextRequest$1
android.view.inputmethod.InputBinding
android.view.inputmethod.InputBinding$1
android.view.inputmethod.InputConnection
android.view.inputmethod.InputMethod
android.view.inputmethod.InputMethod$SessionCallback
android.view.inputmethod.InputMethodInfo
android.view.inputmethod.InputMethodInfo$1
android.view.inputmethod.InputMethodManager
@@ -469,6 +474,7 @@ android.view.inputmethod.InputMethodManager$1
android.view.inputmethod.InputMethodManager$2
android.view.inputmethod.InputMethodManager$ControlledInputConnectionWrapper
android.view.inputmethod.InputMethodManager$H
android.view.inputmethod.InputMethodSession
android.view.inputmethod.InputMethodSession$EventCallback
android.webkit.BrowserFrame
@@ -627,50 +633,59 @@ com.android.internal.telephony.Phone$State
com.android.internal.telephony.Phone$SuppService
com.android.internal.telephony.PhoneBase
com.android.internal.telephony.PhoneStateIntentReceiver
com.android.internal.telephony.SimCard$State
com.android.internal.telephony.gsm.BaseCommands
com.android.internal.telephony.gsm.CallForwardInfo
com.android.internal.telephony.gsm.CommandsInterface
com.android.internal.telephony.gsm.DriverCall
com.android.internal.telephony.gsm.DriverCall$State
com.android.internal.telephony.gsm.GSMConnection
com.android.internal.telephony.IccCard$State
com.android.internal.telephony.BaseCommands
com.android.internal.telephony.CallForwardInfo
com.android.internal.telephony.CommandsInterface
com.android.internal.telephony.DriverCall
com.android.internal.telephony.DriverCall$State
com.android.internal.telephony.gsm.GsmConnection
com.android.internal.telephony.gsm.GSMPhone
com.android.internal.telephony.gsm.GsmAlphabet
com.android.internal.telephony.GsmAlphabet
com.android.internal.telephony.gsm.GsmMmiCode
com.android.internal.telephony.gsm.GsmSimCard
com.android.internal.telephony.gsm.ISms$Stub
com.android.internal.telephony.gsm.PdpConnection$PdpFailCause
com.android.internal.telephony.gsm.RIL
com.android.internal.telephony.gsm.ServiceStateTracker
com.android.internal.telephony.gsm.SimCard
com.android.internal.telephony.ISms$Stub
com.android.internal.telephony.RIL
com.android.internal.telephony.ServiceStateTracker
com.android.internal.telephony.gsm.stk.ComprehensionTlvTag
com.android.internal.telephony.gsm.stk.ResultCode
com.android.internal.util.FastXmlSerializer
com.android.internal.view.IInputConnectionWrapper
com.android.internal.view.IInputConnectionWrapper$MyHandler
com.android.internal.view.IInputConnectionWrapper$SomeArgs
com.android.internal.view.IInputContext
com.android.internal.view.IInputContext$Stub
com.android.internal.view.IInputContext$Stub$Proxy
com.android.internal.view.IInputContextCallback
com.android.internal.view.IInputContextCallback$Stub
com.android.internal.view.IInputContextCallback$Stub$Proxy
com.android.internal.view.IInputMethod
com.android.internal.view.IInputMethod$Stub
com.android.internal.view.IInputMethod$Stub$Proxy
com.android.internal.view.IInputMethodCallback
com.android.internal.view.IInputMethodCallback$Stub
com.android.internal.view.IInputMethodCallback$Stub$Proxy
com.android.internal.view.IInputMethodClient
com.android.internal.view.IInputMethodClient$Stub
com.android.internal.view.IInputMethodClient$Stub$Proxy
com.android.internal.view.IInputMethodManager
com.android.internal.view.IInputMethodManager$Stub
com.android.internal.view.IInputMethodManager$Stub$Proxy
com.android.internal.view.IInputMethodSession
com.android.internal.view.IInputMethodSession$Stub
com.android.internal.view.IInputMethodSession$Stub$Proxy
com.android.internal.view.InputBindResult
com.android.internal.view.InputBindResult$1
com.android.internal.view.InputConnectionWrapper
com.android.internal.view.InputConnectionWrapper$InputContextCallback
com.android.internal.view.menu.ExpandedMenuView
@@ -1163,3 +1178,4 @@ org.xml.sax.helpers.NewInstance
org.xmlpull.v1.XmlPullParserFactory
org.xmlpull.v1.sax2.Driver
sun.misc.Unsafe