summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* am 50b1206d: am cc0e5450: Merge "WspTypeDecoder: fixed decoding of content ↵Wink Saville2012-08-311-5/+1
|\ | | | | | | | | | | | | parameters" * commit '50b1206d5ab38003c0d63b7e6a3589bf00c6ceb5': WspTypeDecoder: fixed decoding of content parameters
| * am cc0e5450: Merge "WspTypeDecoder: fixed decoding of content parameters"Wink Saville2012-08-311-5/+1
| |\ | | | | | | | | | | | | * commit 'cc0e54506132e42f5e0ca2cfee0c399ba49ba149': WspTypeDecoder: fixed decoding of content parameters
| | * WspTypeDecoder: fixed decoding of content parametersJohan Redestig2012-08-301-5/+1
| | | | | | | | | | | | | | | | | | | | | The removed condition prevented any parameter to have 0 as integer value. Change-Id: Iaa8e106e49a51322c07f647f2f66bb7bd6055c89
* | | Update to send sticky broadcasts to all users.Dianne Hackborn2012-08-303-3/+6
| | | | | | | | | | | | Change-Id: I66312f142348282b90fb63f8f20361446d56fb03
* | | am 15e83e03: am 935f0c7a: Merge "Pull up Stats polling and Data Stall Alarm ↵Wink Saville2012-08-283-456/+342
|\ \ \ | |/ / | | | | | | | | | | | | | | | handling to DCT" * commit '15e83e031027a1b161c4ee4f046e3cc1bdf0f92b': Pull up Stats polling and Data Stall Alarm handling to DCT
| * | am 935f0c7a: Merge "Pull up Stats polling and Data Stall Alarm handling to DCT"Wink Saville2012-08-283-456/+342
| |\ \ | | |/ | | | | | | | | | * commit '935f0c7abbf49e71478c79ca32eae972fcca574d': Pull up Stats polling and Data Stall Alarm handling to DCT
| | * Merge "Pull up Stats polling and Data Stall Alarm handling to DCT"Wink Saville2012-08-283-456/+342
| | |\
| | | * Pull up Stats polling and Data Stall Alarm handling to DCTNaveen Kalla2012-08-283-456/+342
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code in GsmDataConnectionTracker and CdmaDataConnectionTracker is very similar for maintaining data activity statistics and detecting data stalls. So it can be moved up to the parent class. Change-Id: I3ec63f6bbfe369e0006d3aa6d6b92abf451657f4
* | | | am 162971e5: am 820e9643: Merge "Plug a fd leak."Wink Saville2012-08-281-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '162971e54aa22f23b193ae5eb44ba12092fc0303': Plug a fd leak.
| * | | am 820e9643: Merge "Plug a fd leak."Wink Saville2012-08-281-0/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '820e964351b4d58c69ce40b64928911eb07efeeb': Plug a fd leak.
| | * | Merge "Plug a fd leak."Wink Saville2012-08-281-0/+6
| | |\ \
| | | * | Plug a fd leak.Johan Redestig2012-07-181-0/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia7189e67e8a03eceaa81e13cac98f20a82a44276
* | | | | am 4b24797a: am fb4c7e43: Merge "Telephony: Send disconnect when disposing DCTs"Wink Saville2012-08-252-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '4b24797a3bf90b95fd46a3acf4ec6bcc4f32530b': Telephony: Send disconnect when disposing DCTs
| * | | | am fb4c7e43: Merge "Telephony: Send disconnect when disposing DCTs"Wink Saville2012-08-252-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'fb4c7e43721fe51e2f749c70f36c0f6be18e8580': Telephony: Send disconnect when disposing DCTs
| | * | | Merge "Telephony: Send disconnect when disposing DCTs"Wink Saville2012-08-252-2/+2
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Telephony: Send disconnect when disposing DCTsAjay Nambi2012-07-312-2/+2
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send disconnect when disposing DCTs. This is invoked multiple times during Inter-RAT (IRAT) handovers and sending disconnect to lower layers keeps things in-sync and avoid race conditions as seen in field tests. Change-Id: I7c0c32a0448934981f0ebbeb9ee2702b87f9b5d9
* | | | am ffcb548f: Empty DC\'s apnList when the DC is free.Wink Saville2012-08-231-3/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'ffcb548fa2fdcc170ef4bbbe50f0348959cac8f1': Empty DC's apnList when the DC is free.
| * | | Empty DC's apnList when the DC is free.Wink Saville2012-08-221-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not doing this causes DC.apnList's to have multiple entries in the apnlist which causes DC's to look like its connected to both IMS and INTERNET. And when selecting CDMA only mode on a Xoom we will not bring up the connection thus no data connectivity. A "cherry-pick" from frameworks/base/ b44b13a3f5967a7ce80f7124dc7b9c486f49c275 Bug: 6939338 Change-Id: I49881adb2710d7fe5d88c3aef748618bda7d65f1
* | | | am 6df4d0f3: am 026b1a18: Merge "Telephony: Fix MT SMS with invalid TOA ↵Jake Hamby2012-08-202-4/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | field causing crash issue" * commit '6df4d0f3d49769e733045b3efcda9060aaae1bfe': Telephony: Fix MT SMS with invalid TOA field causing crash issue
| * | | am 026b1a18: Merge "Telephony: Fix MT SMS with invalid TOA field causing ↵Jake Hamby2012-08-202-4/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | crash issue" * commit '026b1a184c918c9e0ddd028073084e443e5ae0fc': Telephony: Fix MT SMS with invalid TOA field causing crash issue
| | * | Merge "Telephony: Fix MT SMS with invalid TOA field causing crash issue"Jake Hamby2012-08-202-4/+12
| | |\ \
| | | * | Telephony: Fix MT SMS with invalid TOA field causing crash issueRekha Kumar2012-08-202-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Throw FormatException when type of number is incorrect and handle it Change-Id: I305ea1c9e4fee29c84caefec7d7564d46228851d
* | | | | am 4eedbd9a: am f0414167: Merge "Telephony: Fix LTE CB Sms for dual-mode ↵Jake Hamby2012-08-201-3/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | devices" * commit '4eedbd9a3fa0bafb4be05522113a5f6498923b4e': Telephony: Fix LTE CB Sms for dual-mode devices
| * | | | am f0414167: Merge "Telephony: Fix LTE CB Sms for dual-mode devices"Jake Hamby2012-08-201-3/+11
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'f0414167059ea8ac7daae752e0ce7bd858df7f92': Telephony: Fix LTE CB Sms for dual-mode devices
| | * | | Merge "Telephony: Fix LTE CB Sms for dual-mode devices"Jake Hamby2012-08-201-3/+11
| | |\ \ \
| | | * | | Telephony: Fix LTE CB Sms for dual-mode devicesAlex Yakavenka2012-08-201-3/+11
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore 3gpp location information when it is not available. This is required to support dual-mode devices such as CDMA/LTE devices that require support for both 3GPP and 3GPP2 format messages. Change-Id: Ie5d6372ef7e8da6893800e05a83ba840b7fd31f6
* | | | | am 342f21b8: am a462a18c: Merge "Telephony: Fix SmsManager to throw ↵Jean-Baptiste Queru2012-08-201-0/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | IllegalArgumentException" * commit '342f21b85d51d4216192a4e8b9fe6d6706b9bb3e': Telephony: Fix SmsManager to throw IllegalArgumentException
| * | | | am a462a18c: Merge "Telephony: Fix SmsManager to throw IllegalArgumentException"Jean-Baptiste Queru2012-08-201-0/+17
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'a462a18c25eb2a09b0f3c15d3a3c231b25448f0b': Telephony: Fix SmsManager to throw IllegalArgumentException
| | * | | Merge "Telephony: Fix SmsManager to throw IllegalArgumentException"Jean-Baptiste Queru2012-08-201-0/+17
| | |\ \ \
| | | * | | Telephony: Fix SmsManager to throw IllegalArgumentExceptionRika Brooks2012-08-061-0/+17
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IllegalArgumentException condition for: enableCellBroadcastRange() and disableCellBroadcastRange() is if endMessageId < startMessageId. IllegalArgumentException condition for divideMessage() is if input text is null, for copyMessageToIcc() it is if pdu is null. Change-Id: Id344e99728ac92cbfcf2d11b8ca3f920d140bbde
* | | | | am 3a7fdcb7: am 640ac806: Merge "Telephony: Ignore SipPhone"Wink Saville2012-08-151-0/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '3a7fdcb7918fd4e68814952b545c89fb971e5356': Telephony: Ignore SipPhone
| * | | | am 640ac806: Merge "Telephony: Ignore SipPhone"Wink Saville2012-08-151-0/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '640ac8068f3941dcf79c0496285758d4b8180847': Telephony: Ignore SipPhone
| | * | | Telephony: Ignore SipPhoneAlex Yakavenka2012-08-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UiccController's code isn't ready to handle having multiple different PhoneBase objects working at the same time Bug: 6975696 Change-Id: I8f83174cc7db478743445c09fb8f03c66cf1e41e
* | | | | Merge commit 'd9d3f48c' into fix-merge-conflictWink Saville2012-08-141-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd9d3f48c': Telephony: Unregister broadcast receiver Change-Id: I57a974e92592efa8a662f083dd1bfc613c1a945a
| * | | | am 4a306f66: Merge "Telephony: Unregister broadcast receiver"Wink Saville2012-08-141-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '4a306f66962aabf843ce883a8f96450389db5f7a': Telephony: Unregister broadcast receiver
| | * | | Merge "Telephony: Unregister broadcast receiver"Wink Saville2012-08-141-0/+1
| | |\ \ \
| | | * | | Telephony: Unregister broadcast receiverAlex Yakavenka2012-08-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Telephony code registers a BroadcastReceiver but does not unregister it. This is causing Broadcast Register Receivers list to grow large enough to cause situation with excessive JNI refs. Change-Id: I8d2531849fd2b1282aaf5c20516b043b3bf0a2fa
* | | | | | am aa8bd6e9: am 91cccaaf: Merge "Telephony: Always create IccCard"Wink Saville2012-08-143-10/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'aa8bd6e9add9bf3604e2faf1f36faefcbbda7b76': Telephony: Always create IccCard
| * | | | | am 91cccaaf: Merge "Telephony: Always create IccCard"Wink Saville2012-08-143-10/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '91cccaaf575d6faf4e57bcb8a7e78538f28c75cd': Telephony: Always create IccCard
| | * | | | Merge "Telephony: Always create IccCard"Wink Saville2012-08-143-10/+4
| | |\ \ \ \
| | | * | | | Telephony: Always create IccCardAlex Yakavenka2012-08-143-10/+4
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is some bug in master branch which is not in AOSP code that prevents KeyGuard from showing up unless IccCard broadcasts its status Force creation of IccCard (even if it really is absent) so that it broadcasts its state and KeyGuard gets displayed Fix NullPointerException in case card was removed by checking return value of phone.getIccCard() bug: 6983013 Change-Id: I95de1cc8a70a9e3d66d3e5d6059e82626057c5d4
* | | | | | Merge commit '616b281b' into merge-conflict-TelephonySignal-Strength-cleanupWink Saville2012-08-135-178/+52
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '616b281b': Telephony: Signal Strength cleanup Change-Id: I3c211a06c480169d90fb5bc2c1774bd509d91f87
| * | | | | am 15e350db: Merge "Telephony: Signal Strength cleanup"Wink Saville2012-08-138-164/+51
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '15e350dbdedb12c36c4432375e8c58a633b1e492': Telephony: Signal Strength cleanup
| | * | | | Merge "Telephony: Signal Strength cleanup"Wink Saville2012-08-138-164/+51
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Telephony: Signal Strength cleanupUma Maheswari Ramalingam2012-08-028-164/+51
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Make signal strength parsing common for all modes Change-Id: I41bce658c536dc30558224c8ca76d6d70afb78ee
* | | | | am 193becaf: Merge commit \'33f24931ad25942ed8abb142df2edc2c1811350e\' into ↵Wink Saville2012-08-111-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | fix-merge-conflict * commit '193becaf222c8b426f46afad87391ae3e70415c8': Telephony: Fix npe due to mIccCard not being created
| * | | | Merge commit '33f24931ad25942ed8abb142df2edc2c1811350e' into fix-merge-conflictWink Saville2012-08-111-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '33f24931ad25942ed8abb142df2edc2c1811350e': Telephony: Fix npe due to mIccCard not being created
| | * | | Telephony: Fix npe due to mIccCard not being createdAlex Yakavenka2012-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I668bfb97ea7f047182fdcb92ebfec7cc4e73d2f5
| | * | | Telephony: Dynamically instantiate IccCardAlex Yakavenka2012-08-0621-278/+643
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instantiate when get_sim_status request returns Change-Id: I9c9333d23f1e0b23256731b245577d1a25721647
* | | | | Merge commit 'e0e2ebb5' into fix-merge-conflictWink Saville2012-08-0921-277/+643
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e0e2ebb5': Telephony: Dynamically instantiate IccCard Change-Id: I37d65c140033f110bc4990f68adf9489737c9c38