Merge commit '5d2a7b26d6bb06f71904ecd7c828ae90d79b27ef'
* commit '5d2a7b26d6bb06f71904ecd7c828ae90d79b27ef':
Add DoCoMo vendor specific OMNA WSP content type number
Merge commit 'a7493240ab97013458b2dbe16fcd27fb6e85c0af'
* commit 'a7493240ab97013458b2dbe16fcd27fb6e85c0af':
Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set
and minor fixes.
Fix the following
- When PROPERTY_OPERATOR_NUMERIC is not set, the value is "" when CDMAPhone
is initialized. The constructor tries to extract MCC and MNC from this
property and results in a StringIndexOutOfBounds exception. Check for empty
OperatorNumeric string before trying to extract MCC and MNC
- Handle RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING response gracefully.
Change-Id: I749d6801bb4794d56e8fd672dec69dfea2b5c756
Previously the wake lock time was 5 seconds but there
are operations which take longer such as setting up
and tearing down so increase the default to 30 seconds.
Also provide TelephonyProperty.PROPERTY_WAKE_LOCK_TIMEOUT
so it can be overridden at build time.
Bug: 2268276
Change-Id: I3ae1fb196564c9fd5b9ea3e3b0927be9dd9ef255
but can also be used by unbundled apps. Move android.text.util.Regex there as
a starting example, renamed to a more sensible (?) com.android.common.Patterns.
Set up a corresponding test package, and move RegexTest (to PatternsTest).
Update clients.
Merge commit '572e0087a86c6781e3334f8a6f901039a407138d' into eclair-mr2
* commit '572e0087a86c6781e3334f8a6f901039a407138d':
Return null if SIM doesn't have the MSISDN Aplha tag.
Merge commit 'dfaec0d987f8f8e8822f554020795bea090e96c1'
* commit 'dfaec0d987f8f8e8822f554020795bea090e96c1':
Throttle nitz updates as the are too numerous on cdma.
Merge commit '38210df337a1485bd3d2eb5adc223f443fe1b5b0' into eclair-mr2
* commit '38210df337a1485bd3d2eb5adc223f443fe1b5b0':
Throttle nitz updates as the are too numerous on cdma.
Merge commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837' into eclair-mr2
* commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837':
Fix the selection of locale from SIM mcc.
1. Spanish SMS 71-160 chars not sent. This was because calculateLength
allowed for single-segment EMS encoding, while encodeUserDataPayload
did not. For now, change calculateLength to match encodeUserDataPayload
(ie, fallback to UTF16 in this case). (b/2224849)
2. Unicode value of N w/tilde was incorrect. (b/2224849)
3. Add '\' and '/' to the list of valid separators in CDMA SMS numeric
addresses. (b/2236527)
Merge commit '47601c74f1302f70716c81714373687358ce8d8b'
* commit '47601c74f1302f70716c81714373687358ce8d8b':
Add needsOtaServiceProvisioning and used to not allow
Merge commit '09263e1bc0f8f783b24b92643d4ccda87966d01f' into eclair-mr2
* commit '09263e1bc0f8f783b24b92643d4ccda87966d01f':
Add needsOtaServiceProvisioning and used to not allow
Two issues - getting config then setting locale by mcc and then setting the config (to set
mcc/mnc) would overwrite the locale set in the middle. Also, using a "new Configuration()"
instead of asking the ActivityManager.getConfiguration gets different values than the current
ones, and would also overwrite our change.
bug: 2241461
bug: 2239810
Merge commit '33728557540d9033ff396f7a2ddd4fb304fdedcd'
* commit '33728557540d9033ff396f7a2ddd4fb304fdedcd':
Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
Merge commit 'e1cba3dbad30286c5c3006e0b9c1226ef72ad8e4'
* commit 'e1cba3dbad30286c5c3006e0b9c1226ef72ad8e4':
Add Authentication Type field to the APN settings.
