Merge commit '3f442ece257d416b48f7803a4cc263f0215faa0d' into gingerbread-plus-aosp
* commit '3f442ece257d416b48f7803a4cc263f0215faa0d':
Fix character count bug and Javadoc typos in SMS (with test cases)
Fix a character count bug I discovered while working on related SMS
bugs. Includes a new set of test cases to verify the fix for the
buggy calculateLength() methods ("runtest frameworks-telephony").
You can also verify that the counter works properly in the Mms app
by typing characters until the boundary is crossed where an
additional message part is required. The counter should count down
to 0 characters remaining before increasing the message count.
Change-Id: I4de68b82dfc53dcae094865798f2c0235a355d43
Merge commit 'c636b846160482fbebd9a3792d52b9ff864228f2' into gingerbread-plus-aosp
* commit 'c636b846160482fbebd9a3792d52b9ff864228f2':
Enhance WspTypeDecoder to decode Content Type Parameters
This patch enables WspTypeDecoder to correctly parse content type
parameters as described in the Wap230 WSP specifications
(wap-230-wsp-20010705-a section 8.4.2.24) which are then passed on
as part of the WAP_PUSH intent notification.
It also recognises all Well Known WSP Content types, and simplifies
their retrieval (i.e. a well known content type will always be
available through the WspTypeDecoder.getValueString() method).
Change-Id: I0eb3f9ac287aa7cb53312777c4be54b1939fa857
Merge commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9' into kraken
* commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9':
Use integer for loop counter instead of float
New test in FrameworkTest for the VelocityTracker class
Preserve '+' in phone numbers imported from SIM.
Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory
bug: 2644009
Change-Id: I1ecc09312f404e00bbf30befffb1811efe578cc3
This makes properties easier to read so from:
ro.cdma.data_retry_config=default_randomization=2000,0,0,120000,180000
to this:
ro.cdma.data_retry_config="default_randomization=2000,0,0,120000,180000"
Change-Id: Ied2a7be0102512cd2ce528d566c19ed3a8e2f480
Most of these are file moves; a couple notable exceptions are the changes due to the move, and fixing up test code:
- database/DatabaseCursorTest.java
- database/DatabaseStatementTest.java
- net/UriTest.java
