| ace9a749c5a2a5e07527f728b7331423d16c36cd |
30-Oct-2013 |
Sukanya Rajkhowa <srajkh@codeaurora.org> |
SMS over IMS bug fixes
This change includes the following:
1) SMS over IMS remaining patches which address review comments
2) Fix for Bug:11378993
For MT SMS over IMS, if an application uses the createFromPdu(byte[] pdu) API
instead of createFromPdu(byte[] pdu,String format) API, we first try to create
SmsMessage from raw PDU with the format of active phone. That either returns a
valid SmsMessage object or throws a RuntimeException causing the correct format
to be used the next time. If GsmSmsAddress is not valid, we should throw
a RuntimeException which is handled by createFromPdu(byte[] pdu)
3) Fix for Bug:11424054
Register for ICC changes and handle new SMS on ICC
Bug: 11378993, 11424054
Change-Id: I94bcfcf93d8205c2916997091617899c6ebdd5e5
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
|
| 1260f1c6c909f2940989b72afe1b91fd83845eaa |
14-Sep-2013 |
Sukanya Rajkhowa <srajkh@codeaurora.org> |
Support SMS over IMS
ImsSMSDispatcher is part of IccSmsInterfaceManager.
It always receives calls to send sms first and decides
whether to use ims call flow or gsm/cdma based on response
to REQUEST_IMS_REGISTRATION_STATE.
When ims is registered and sms is supported, the request also returns
sms format to use.
In case of sms over ims failure, RIL_REQUEST_IMS_SEND_SMS sets
messageRef from RIL_SMS_RESPONSE of corresponding failed MO SMS, and
sets retry field to non-zero. If voice is available, sends
RIL_REQUEST_IMS_SEND_SMS retries with data encoded based on voice tech
available. If voice is not available, sets retry counter to max and
skips retries and sends failure to client.
Bug: 9626411
Change-Id: I4c63c8fc0eb2191847b509e66772e3de27d491ed
Signed-off-by: Ed Tam <etam@google.com>
Conflicts:
src/java/com/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
|
| 7667e7abe11b94b5573b565e25adbffdf7d65141 |
11-Apr-2013 |
Jake Hamby <jhamby@google.com> |
Fix some frameworks-telephony test compile errors.
Fix some frameworks-telephony test case compile errors due to
package name change for ApnSetting and additional methods added
to BaseCommands.
Change-Id: I72a9caabd6b7d09e9d0f1e39ab7bd24fa0e60594
om/android/internal/telephony/ApnSettingTest.java
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
|
| 4e9ed0410d72180872d59b14cb375c1c2ed94788 |
26-Mar-2013 |
Jake Hamby <jhamby@google.com> |
resolved conflicts for merge of 4eede890 to jb-mr2-dev
Change-Id: I7ee1d93d832275ad04d4e6bbae68d22ae86322ac
|
| 01fdbd3285be1a8ba2143a4bc11a0f5065bb68d0 |
10-May-2012 |
Rika Brooks <rbrooks@codeaurora.org> |
Telephony: Fix IntRangeManager
-Fix to populate SmsBroadcastConfigInfo list with all the possible
range lists upon enable and disable to match previous implementation.
-Fix ClientRange to be ordered by start id, then by end id.
-Fix enableRange to handle missing cases:
-enable exact same range, i.e. new [x, y], existing [x, y]
-enable range that is already enclosed in existing range i.e.
adding [3, 3] to existing range [1,3]
-enable (startId -1) == range.endId, i.e. new [3, y] existing [1, 2]
-Fix where range.endId is not updated correctly
-Fix disableRange to first update mRange then call updateRange.
-Add more unit test cases.
Bug: 8355035
Change-Id: I83308c76ed28c6f753326aeaac6bec1d88c01b39
om/android/internal/telephony/IntRangeManagerTest.java
|
| 22d85a8e3a575a6d01d2c788587971657dfe20c6 |
23-Feb-2013 |
Wink Saville <wink@google.com> |
Clean up member variables.
Change-Id: Ib60f350131ade626aca682407ea0b4377b16f6c6
om/android/internal/telephony/gsm/UsimDataDownloadTest.java
|
| 91187d41b202273075a302a4fd4f8df719b5dee0 |
09-Feb-2013 |
Jake Hamby <jhamby@google.com> |
Fix test case broken by change to ISms method signature.
A recent change to move ISms.aidl from frameworks/opt/telephony to
frameworks/base caused this test case not to compile. Fixed the caller
to add the new argument containing the package name of the caller.
Bug: 8107987
Change-Id: I2b1acefbfe0588a940a506f891077b00fa026d2d
om/android/internal/telephony/SimSmsTest.java
|
| 48a57c9ac6516c0f34a9593d6ffd64173fdf6953 |
10-Jan-2013 |
Jake Hamby <jhamby@google.com> |
Add frameworks-telephony test cases for CDMA SMS.
Add test cases to verify support for Shift-JIS encoding/decoding
for CDMA SMS BearerData. Also test whether reserved bearer data
subparameters are properly skipped.
$ runtest -c com.android.internal.telephony.cdma.sms.CdmaSmsTest \
frameworks-telephony
The original version of this patch did not merge from AOSP to the
internal tree because of changes to mock RIL files that have been
removed. This patch contains only the change to CdmaSmsTest.java.
Change-Id: Ib51d99c73c636467b970327e5c6af2d6a289c651
om/android/internal/telephony/cdma/sms/CdmaSmsTest.java
|
| 6387253f9b0eb8bec049115498ec1f2bfd6d991d |
05-Feb-2013 |
Jake Hamby <jhamby@google.com> |
am 9eef81ce: am 89558696: Merge "Telephony: Define enable/disable APIs for Cdma CMAS"
# By Rika Brooks
# Via Android Git Automerger (1) and others
* commit '9eef81ce80e72d68a8349fd84797276cb9cbe957':
Telephony: Define enable/disable APIs for Cdma CMAS
|
| 895586961de9992a4feefc57b648e01d158a382c |
04-Feb-2013 |
Jake Hamby <jhamby@google.com> |
Merge "Telephony: Define enable/disable APIs for Cdma CMAS"
|
| a63f55cf17629426d976830429a7612387532195 |
24-Jul-2012 |
Rika Brooks <rbrooks@codeaurora.org> |
Telephony: Define enable/disable APIs for Cdma CMAS
- Define enableCellBroadcastRange, disableCellBroadcastRange,
enableCellBroadcast, disableCellBroadcast for Cdma broadcast.
Create CdmaBroadcastRangeManager extended from existing IntRangeManager.
Change-Id: I5d70175862547475f49e08328ab3dcc5560e9096
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
|
| 79555c93820b5159b25c01fff47d16fe623ce866 |
31-Jan-2013 |
Wink Saville <wink@google.com> |
Fix some broken tests.
Change-Id: I10d48c6597bb0c45d70a6a2d77a0afb9d295568d
om/android/internal/telephony/ApnSettingTest.java
om/android/internal/telephony/Wap230WspContentTypeTest.java
|
| babd5ede15dfced63fc5bf5a522634fd85e3e0f1 |
31-Jan-2013 |
Wink Saville <wink@google.com> |
am 6943a913: am 5dcd8d72: Merge "Fix failed test case when running framework auto test."
# By xiaohui wang
# Via Android Git Automerger (1) and others
* commit '6943a913f8bb044f40f94a933c1e2b24e103f59a':
Fix failed test case when running framework auto test.
|
| 0577de49f739f113f6e07d5539defc8d48232282 |
30-Jan-2013 |
xiaohui wang <xiaohui.wang@sonymobile.com> |
Fix failed test case when running framework auto test.
The method RetryManager.setRetryCount was modified in
f186b07b463447707117e2b54fc02f7ed30d6e43, However the
corresponding test cases were not updated and now fail.
The reason for failing is that setRetryCount no longer resets
the variable mRetryForever as it used to, and therefore
isRetryNeeded() returns true instead of false failing the
testcases.
Change-Id: Icbf23ada8000fab93ee34087e125d9b12d7e7897
om/android/internal/telephony/TelephonyUtilsTest.java
|
| 60dc9dc311361f9fb52155ea28d383d55afa90d8 |
11-Dec-2012 |
Wink Saville <wink@google.com> |
Merge commit '7e4b734a' into fix-merge-conflict
* commit '7e4b734a':
Telephony: Move uicc classes into uicc package
Change-Id: Iacc7f1805500bfe55299aaedbe0241ebba8e8b23
|
| d720945f2be5ea5fe0faf67e67d9ea0e184eba67 |
01-Aug-2012 |
Alex Yakavenka <ayakav@codeaurora.org> |
Telephony: Move uicc classes into uicc package
Reduce constructor visibility to package where
possible
Dependent Changes:
I3b718b9aea1f21c7906c8243b4ca0db6af495a08
I80204a2f3dc57cac875abeab390bb9db7a636ff7
Ib9c19e8b157dc7ec74eb14baca5bd3b5caf08c47
Change-Id: Ib4f43374c041cb5eaf2e3883e5ea28b2eb2c9a69
om/android/internal/telephony/AdnRecordTest.java
om/android/internal/telephony/GsmAlphabetTest.java
om/android/internal/telephony/IccServiceTableTest.java
om/android/internal/telephony/SMSDispatcherTest.java
om/android/internal/telephony/SimPhoneBookTest.java
om/android/internal/telephony/SimUtilsTest.java
om/android/internal/telephony/cdma/CdmaSmsCbTest.java
om/android/internal/telephony/gsm/GsmSmsCbTest.java
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
om/android/internal/telephony/gsm/UsimServiceTableTest.java
|
| ded9c0af7fa49504c047275ed34c2d3b22bf0c3a |
07-Dec-2012 |
Wink Saville <wink@google.com> |
Use Rlog
Change-Id: Ie013f51215de8380b8de74161b6056b010711cfd
om/android/frameworks/telephonytests/TelephonyMockRilTestRunner.java
om/android/internal/telephony/CallerInfoTest.java
om/android/internal/telephony/MccTableTest.java
om/android/internal/telephony/SmsMessageBodyTest.java
om/android/internal/telephony/cdma/CdmaSmsCbTest.java
om/android/internal/telephony/gsm/GSMTestHandler.java
om/android/internal/telephony/gsm/GsmSmsCbTest.java
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
om/android/internal/telephony/gsm/UsimDataDownloadTest.java
om/android/internal/telephony/mockril/MockRilTest.java
|
| 99c2e1d6749cfad2a8ca94a47857d8c3bfc09454 |
27-Nov-2012 |
Wink Saville <wink@google.com> |
Use Rlog instead of Log.
Change-Id: I2f44193b294513e743526e5c163e7d9a45308b28
om/android/internal/telephony/MccTableTest.java
om/android/internal/telephony/SmsMessageBodyTest.java
om/android/internal/telephony/cdma/CdmaSmsCbTest.java
om/android/internal/telephony/gsm/GSMTestHandler.java
om/android/internal/telephony/gsm/GsmSmsCbTest.java
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
om/android/internal/telephony/gsm/UsimDataDownloadTest.java
|
| d008821aacac55a7d4717fb52b85ab5590be30eb |
17-Nov-2012 |
Wink Saville <wink@google.com> |
Remove mockril.
Mock ril isn't being used and the V8 library is being removed,
so mockril is being removed.
Change-Id: I76238bd97ff82072786e05a275bd90102c02f391
om/android/frameworks/telephonytests/TelephonyMockRilTestRunner.java
om/android/internal/telephony/CallerInfoTest.java
om/android/internal/telephony/mockril/MockRilTest.java
|
| ac1701bae6a076fe92b05875aa94b6bef45838c1 |
31-Aug-2012 |
Jake Hamby <jhamby@google.com> |
am 115632cc: Fix CDMA decoding of multipart UTF-16 SMS messages.
* commit '115632cc56f813bd21543f8532c763d7d2968046':
Fix CDMA decoding of multipart UTF-16 SMS messages.
|
| 115632cc56f813bd21543f8532c763d7d2968046 |
31-Aug-2012 |
Jake Hamby <jhamby@google.com> |
Fix CDMA decoding of multipart UTF-16 SMS messages.
Recent changes to support CMAS over CDMA introduced a bug causing
an exception to be thrown when decoding multipart UTF-16 encoded
messages. This change fixes the exception by correctly subtracting
the header size from the number of bytes to decode. It also adds
more robust error handling to try to decode the maximum length
possible instead of throwing an exception if the length is still
larger than the user data length after subtracting the header.
This also fixes a bug in the encoder, which was padding the
UTF-16 user data to 16-bit alignment, which is incorrect (should
be padded to an 8-bit boundary). The code happened to work because
we always generated a UDH that was an even number of bytes
(including length) so the padding was a no-op. The decoder works
correctly.
Bug: 6939151
Change-Id: I4000fa2f4703b39e5ed7e5bd8490828303ef8979
om/android/internal/telephony/cdma/sms/CdmaSmsTest.java
|
| 7f7d82aac56022880f613772ed4a90738075c843 |
31-Aug-2012 |
Wink Saville <wink@google.com> |
am 50b1206d: am cc0e5450: Merge "WspTypeDecoder: fixed decoding of content parameters"
* commit '50b1206d5ab38003c0d63b7e6a3589bf00c6ceb5':
WspTypeDecoder: fixed decoding of content parameters
|
| 50b1206d5ab38003c0d63b7e6a3589bf00c6ceb5 |
31-Aug-2012 |
Wink Saville <wink@google.com> |
am cc0e5450: Merge "WspTypeDecoder: fixed decoding of content parameters"
* commit 'cc0e54506132e42f5e0ca2cfee0c399ba49ba149':
WspTypeDecoder: fixed decoding of content parameters
|
| 0fcf2097e7e217319b625d5dfc24aded06c02227 |
30-Aug-2012 |
Johan Redestig <johan.redestig@sonymobile.com> |
WspTypeDecoder: fixed decoding of content parameters
The removed condition prevented any parameter to have
0 as integer value.
Change-Id: Iaa8e106e49a51322c07f647f2f66bb7bd6055c89
om/android/internal/telephony/Wap230WspContentTypeTest.java
|
| a6b55dcb21ebc8e781d3031ff2de74e23427abb1 |
26-Jul-2012 |
Jake Hamby <jhamby@google.com> |
am 324dd8d1: am b8a13d30: Implement CMAS service category program results.
* commit '324dd8d12e3c3df713e981119d8e88c6afefa962':
Implement CMAS service category program results.
|
| b8a13d300b245e0080aa01275e232f54d5d0e09c |
25-Jul-2012 |
Jake Hamby <jhamby@google.com> |
Implement CMAS service category program results.
Correctly handle CDMA Service Category Program Data requests,
and send the SCPT response to the message center. Parcel SCPD
operations as an ArrayList instead of an array (current version
will throw ClassCastException when the array is cast).
Bug: 6853691
Change-Id: I949ea68891c78306059248832e59a593ab606e11
om/android/internal/telephony/cdma/CdmaSmsCbTest.java
|
| 3c93767bab0040818e0f530c0d0102654a87e0c0 |
25-Jul-2012 |
Wink Saville <wink@google.com> |
Merge "Revise CellInfo API's"
|
| dbbcde988d620307a97afbd9a6dc389eab02b586 |
18-Jul-2012 |
Naveen Kalla <nkalla@codeaurora.org> |
Move SmsUsageMonitorShortCodeTest from frameworks/base/telephony/tests
This test was missed out while migrating telephony code from frameworks/base.
Change-Id: Id3a2add255057b8b977e48a4fa873b44c3ddc732
om/android/internal/telephony/SmsUsageMonitorShortCodeTest.java
|
| ef1d4bff9bbf7d967dbcace73f08910e14e367d0 |
17-Jul-2012 |
Wink Saville <wink@google.com> |
Revise CellInfo API's
Change-Id: I35bc22caf4a6a2255f2ce122690823f8d602b359
om/android/internal/telephony/TestPhoneNotifier.java
|
| c38bb60d867c5d61d90b7179a9ed2b2d1848124f |
12-Jul-2012 |
Wink Saville <wink@google.com> |
Create telephony-common - DO NOT MERGE
telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony
Change-Id: I32cbb5eec1fa239c1587e055c8f7ef4fc48fb62c
om/android/frameworks/telephonytests/TelephonyMockRilTestRunner.java
om/android/internal/telephony/ATResponseParserTest.java
om/android/internal/telephony/AdnRecordTest.java
om/android/internal/telephony/ApnSettingTest.java
om/android/internal/telephony/CallerInfoTest.java
om/android/internal/telephony/GsmAlphabetTest.java
om/android/internal/telephony/GsmSmsTest.java
om/android/internal/telephony/IccServiceTableTest.java
om/android/internal/telephony/IntRangeManagerTest.java
om/android/internal/telephony/MccTableTest.java
om/android/internal/telephony/NeighboringCellInfoTest.java
om/android/internal/telephony/PhoneNumberUtilsTest.java
om/android/internal/telephony/PhoneNumberWatcherTest.java
om/android/internal/telephony/SMSDispatcherTest.java
om/android/internal/telephony/SimPhoneBookTest.java
om/android/internal/telephony/SimSmsTest.java
om/android/internal/telephony/SimUtilsTest.java
om/android/internal/telephony/SmsMessageBodyTest.java
om/android/internal/telephony/TelephonyUtilsTest.java
om/android/internal/telephony/TestPhoneNotifier.java
om/android/internal/telephony/Wap230WspContentTypeTest.java
om/android/internal/telephony/cdma/CdmaSmsCbTest.java
om/android/internal/telephony/cdma/sms/CdmaSmsTest.java
om/android/internal/telephony/gsm/GSMPhoneTest.java
om/android/internal/telephony/gsm/GSMTestHandler.java
om/android/internal/telephony/gsm/GsmSmsCbTest.java
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
om/android/internal/telephony/gsm/UsimDataDownloadTest.java
om/android/internal/telephony/gsm/UsimServiceTableTest.java
om/android/internal/telephony/mockril/MockRilTest.java
|
| 0825495a331bb44df395a0cdb79fab85e68db5d5 |
12-Jul-2012 |
Wink Saville <wink@google.com> |
Create telephony-common
telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony
Change-Id: I32cbb5eec1fa239c1587e055c8f7ef4fc48fb62c
om/android/frameworks/telephonytests/TelephonyMockRilTestRunner.java
om/android/internal/telephony/ATResponseParserTest.java
om/android/internal/telephony/AdnRecordTest.java
om/android/internal/telephony/ApnSettingTest.java
om/android/internal/telephony/CallerInfoTest.java
om/android/internal/telephony/GsmAlphabetTest.java
om/android/internal/telephony/GsmSmsTest.java
om/android/internal/telephony/IccServiceTableTest.java
om/android/internal/telephony/IntRangeManagerTest.java
om/android/internal/telephony/MccTableTest.java
om/android/internal/telephony/NeighboringCellInfoTest.java
om/android/internal/telephony/PhoneNumberUtilsTest.java
om/android/internal/telephony/PhoneNumberWatcherTest.java
om/android/internal/telephony/SMSDispatcherTest.java
om/android/internal/telephony/SimPhoneBookTest.java
om/android/internal/telephony/SimSmsTest.java
om/android/internal/telephony/SimUtilsTest.java
om/android/internal/telephony/SmsMessageBodyTest.java
om/android/internal/telephony/TelephonyUtilsTest.java
om/android/internal/telephony/TestPhoneNotifier.java
om/android/internal/telephony/Wap230WspContentTypeTest.java
om/android/internal/telephony/cdma/CdmaSmsCbTest.java
om/android/internal/telephony/cdma/sms/CdmaSmsTest.java
om/android/internal/telephony/gsm/GSMPhoneTest.java
om/android/internal/telephony/gsm/GSMTestHandler.java
om/android/internal/telephony/gsm/GsmSmsCbTest.java
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
om/android/internal/telephony/gsm/UsimDataDownloadTest.java
om/android/internal/telephony/gsm/UsimServiceTableTest.java
om/android/internal/telephony/mockril/MockRilTest.java
|