Merge commit '641bb3d8dfd72f57356d39ef00256d6077c9e235'
* commit '641bb3d8dfd72f57356d39ef00256d6077c9e235':
expose (but still hide) sms user data headers
Merge commit 'ff0d91479d3c8523bc290bd1b65fcd2546be1d40'
* commit 'ff0d91479d3c8523bc290bd1b65fcd2546be1d40':
Manually merge a few fixes from cupcake and cupcake_dcm.
CL 144717: Correctly set user data payload length for non-7-bit encoded payload.
CL 149058: Check for null TP-OA in SmsMessage.parseMessageBody().
CL 138094: Make sure call state (and other updates) have a chance to get processed between data setup attempts.
CL 132624: Added a comment for a way to save a message to the SIM.
Bug 1883998: We only support sending 8-bit references for now.
Bug 1885080: Also fix the GsmAlphabetTest, which started failing when SmsHeader
was re-worked.
Merge commit 'c3b7e4e7dda7a81e7f1017f17adb717ffb3d50d2'
* commit 'c3b7e4e7dda7a81e7f1017f17adb717ffb3d50d2':
Telephony support for SMS memory reporting to the network.
- Use ordered broadcast to allow receivers to set a result code.
- Ack SMS with result code.
- New RIL command to report memory status.
- Fixed a typo in a Gservices setting.
- Merge in CL 137895 (hold a wake lock while broadcasting SMS_RECEIVED).
PhoneStateListener events like LISTEN_CALL_STATE_CHANGED,
have privacy information like phone numbers and hence,
need to be protected with a permission. The permission
READ_PHONE_STATE is used for this purpose. Use the permission
trick to ensure backward compatability.
Merge commit 'f6355e24f5382356ea197135fdeff827aabfdb90'
* commit 'f6355e24f5382356ea197135fdeff827aabfdb90':
Motorola additions for CDMA support without CdmaSuppConnTracker
Merge commit 'cf2119a9755d9e2713ce78e84d0826d430a11a62'
* commit 'cf2119a9755d9e2713ce78e84d0826d430a11a62':
Check for desiredPowerState (airplane mode) before setting up data.
Remove dimmed background (and accompanying animation) for global
The corresponding fix has already been made for GSM.
When data state is in CONNECTING state and and we try
to disable the data, we set a pending disconnect but never
disconnect once we are connected.
See http://b/issue?id=1751571
Changes the semantics of SmsHeader from containing only opaque data
to exposing occurs-once frequently-used fields together with a list
of opaque fields. Also changes the coding to and from byte array to
be symmetrical, whereas previous encoding had an extra length field.
Cdma SmsMessage -- cleanup of code paths along with adjustments to
match the new header semantics, which should address at least some
of the issues with concatenated messages. See http://b/issue?id=1809759
CellLocation uses TelephonyManager to get the PhoneType.
TelephonyManager uses the system property to get the phoneType,
if the ITelephony interface is not up.
ACCESS_FINE_LOCATION should imply ACCESS_COARSE_LOCATION, so either of these
permissions should be sufficient to allow TelephonyManager.getCellLocation().
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '808f2919ee9cd9ff678ef091da0c7b703c929003' into donut
* commit '808f2919ee9cd9ff678ef091da0c7b703c929003':
AI 148962: Default language in Switzerland should be german and not english.
If there is a pending disconnect, and the previous connection
attempt succeeds, we don't disconnect and hence the state remains
in DISCONNECTING. Ex: user is on Wifi, location app calls
enableApnType(SUPL) and then we set state to INITING. It then
calls disableApnType(SUPL) we register a pending disconnect.
When the data connection attempt is successful, we don't disconnect,
as the PDP Connection State has not been set to ACTIVE and we check
for this state. This fix removes the dependency on ACTIVE state check.
related to issue http://b/issue?id=1782245
- fixes 7bit ASCII encode and decode (previous completely broken)
- also consolidates encoding of user data, and changed to match
the conventions of the new data coding -- previously likely
broken for several cases
Merge commit '14533d2652ce786f1ca84af1b54adaa201455989' into donut
* commit '14533d2652ce786f1ca84af1b54adaa201455989':
AI 147720: Set default language for NL to nl.
Merge commit '78b1511d96f0b2123bfadf51c5c1ccf33cdd2b3d' into donut
* commit '78b1511d96f0b2123bfadf51c5c1ccf33cdd2b3d':
AI 147541: Add cs as default language for cz.
Send the path of the EF file for ICC IO Command.
Currently, this is null. This is for the upcoming support
for USIM and CDMA changes.
Tested:
1. Intial load of records while boot up.
2. Importing contacts from SIM.
3. Voice mail.
4. SMS
