Merge commit 'e7486695ced2dd135f6e2223b582adde4155b917' into gingerbread-plus-aosp
* commit 'e7486695ced2dd135f6e2223b582adde4155b917':
Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE
Merge commit 'b42aa98d44f1ad22746005264274220770de2756' into gingerbread-plus-aosp
* commit 'b42aa98d44f1ad22746005264274220770de2756':
Correct VM number updation during MBDN refresh.
Makes PhoneNumberUtils.java support numbers in international
format (starting with ‘+’ character) after a CLIR command.
Previously a plus character would always be removed unless it
occupied the first position of the number string. In this case,
when the number is preceded by #31# (CLIR), the plus character
will be removed as well.
This is an error, prohibiting a type approval of the phone.
This change will detect the plus character after the CLIR command
and will insert it at the right position.
Change-Id: Ib220aee7b3eda30cde960db8c7470523dc5fd313
Merge commit '98738272e3b680559e1e0a7b665a0ebb4038f684' into gingerbread-plus-aosp
* commit '98738272e3b680559e1e0a7b665a0ebb4038f684':
Remove voice mail number verification for testing on no-sim device
The voice mail number and voice mail tag are not getting updated properly
during MBDN refresh. When the data in MBDN EF is invalid, the voice mail
number and voice mail tag are unchanged. They retain their previous value
where as they should be null in this case.
Change-Id: Ic3b9cb4cdf3ee5d2a33fc7e47cac968e752a0940
When there is a problem communicating with the RIL (e g when the SIM
card is not connected) the IccPhoneBookManager hangs. This is corrected.
Change-Id: I28cf6cd3b79a29f4784fdef2b5072af5533e53da
Removes all dashes if locale isn't NANP or Japan and the number
don't have there country code.
Use case: If adding a number starting with 1nnnnnn and then
trying to add a country code before (ex +46) we will first
trigger NANP formatting with +1-nnn-nnn so when we get
+41-nnn-nnn we will still have the old NANP formatting.
This number should be shown as +461nnnnnn.
Change-Id: I5cab830350d785a58367eba79e268d9e8ee16aac
Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into froyo-plus-aosp
* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
Make the DUN apn data secure.
Rather than come out of the user-modifiable APN DB, the DUN APN data will
come first from a built-in resource and then potentially overriden by a secure
setting (which is gservices upgradable).
Also made the "require-dun" setting secure-setting overridable.
bug:2736390
Change-Id: I1e4644c3839f06c977b83797641f3948785146a2
Merge commit '3aecdb9d7e92b1a91860600feefb5c0062b652cf' into kraken
* commit '3aecdb9d7e92b1a91860600feefb5c0062b652cf':
fix build
Fix some typos and other cosmetic cleanups in telephony framework.
Merge commit '5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3' into kraken
* commit '5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3':
Fix updating and deleting FDN entries with an empty alpha identifier.
Abort FDN delete when number is empty (instead of name)
- Fix AdnRecord.buildAdnString() to generate the correct record when alpha
identifier is empty. This allows the user to update an FDN entry to remove
the alpha identifier. Previously the entire entry would be deleted because
an empty record was generated here when the alpha identifier was empty,
rather than a record containing the phone number with an empty alpha tag.
Also, return null if the number or alpha tag are too long.
- Fix bug in IccProvider.delete() where efType was compared against local
FDN constant rather than IccConstants.EF_FDN. This would always return
false. Comparing with IccConstants.EF_FDN gives the intended behavior.
Change-Id: I0ea75d7e107c7318c9a48ae6e0a15845a718f4c0
Merge commit '55b7d1243f15395a102971e8fdc57444638729ac' into kraken
* commit '55b7d1243f15395a102971e8fdc57444638729ac':
SetLocaleByCarrier, only if its not an unknown carrier.
- Fix typos in Javadoc and comments.
- Fix Javadoc @link references to other classes/methods.
- Rename MISSING_UKNOWN_APN to MISSING_UNKNOWN_APN in DataConnection.
- Remove unused (and misspelled) RETRYIES_* consts in RetryManager.
Change-Id: I3b44ac8320d6c1e4c350be600c7ef266aaf735e4
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.
Merge commit '79090cb3da132d07cd3888ef9242df9872fb4aa1' into kraken
* commit '79090cb3da132d07cd3888ef9242df9872fb4aa1':
Change license for the UUS Information file.
Remove ProximityAlerts Receiver when last ProximityAlert expires.
