OSDN Git Service
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:55:21 +0000 (14:55 -0800)]
merge from open-source master
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:06:34 +0000 (14:06 -0800)]
merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
Jean-Baptiste Queru [Sun, 15 Nov 2009 20:06:41 +0000 (12:06 -0800)]
merge from eclair
Jean-Baptiste Queru [Fri, 13 Nov 2009 02:46:07 +0000 (18:46 -0800)]
eclair snapshot
Naveen Kalla [Thu, 22 Oct 2009 18:12:40 +0000 (11:12 -0700)]
am
36b721c2: ril.h: Change latitude-longitude fields to be compliant with 3GPP2 spec.
Merge commit '
36b721c2fcbc98885a4ccd04ddf50dd690142d5e' into eclair-plus-aosp
* commit '
36b721c2fcbc98885a4ccd04ddf50dd690142d5e':
ril.h: Change latitude-longitude fields to be compliant with 3GPP2 spec.
Naveen Kalla [Thu, 22 Oct 2009 18:02:05 +0000 (11:02 -0700)]
am
36b721c2: ril.h: Change latitude-longitude fields to be compliant with 3GPP2 spec.
Merge commit '
36b721c2fcbc98885a4ccd04ddf50dd690142d5e' into eclair-mr2-plus-aosp
* commit '
36b721c2fcbc98885a4ccd04ddf50dd690142d5e':
ril.h: Change latitude-longitude fields to be compliant with 3GPP2 spec.
Naveen Kalla [Wed, 14 Oct 2009 01:29:41 +0000 (18:29 -0700)]
ril.h: Change latitude-longitude fields to be compliant with 3GPP2 spec.
Base Station Latitude and Longitude values in the response to the
RIL_REQUEST_REGISTRATION_STATE message need to be changed from
hexadecimal values to decimal values compliant with the 3GPP2 C.S0005-A
specification.
Bug:
2201613
Change-Id: I2591f43bf78b861cf5cadd1eb66866bcf6605a29
jsh [Thu, 1 Oct 2009 04:14:32 +0000 (21:14 -0700)]
am
43265610: Update description for RIL_REQUEST_SET_LOCATION_UPDATES to include CDMA.
Merge commit '
432656105ccc2f4f891fbe8fb5b636f2428f1f4e' into eclair-plus-aosp
* commit '
432656105ccc2f4f891fbe8fb5b636f2428f1f4e':
Update description for RIL_REQUEST_SET_LOCATION_UPDATES to include CDMA.
jsh [Wed, 30 Sep 2009 00:46:11 +0000 (17:46 -0700)]
Update description for RIL_REQUEST_SET_LOCATION_UPDATES to include CDMA.
Naveen Kalla [Tue, 29 Sep 2009 22:54:25 +0000 (15:54 -0700)]
am
03c1edf2: ril.h: Add a failure cause for CDMA call failures, rename RIL_REQUEST_CDMA_VALIDATE_AKEY and minor clarifications in the interface definitions.
Merge commit '
03c1edf23e76a83b95ac6847e333cb1329bbfa1d' into eclair-plus-aosp
* commit '
03c1edf23e76a83b95ac6847e333cb1329bbfa1d':
ril.h: Add a failure cause for CDMA call failures, rename
Naveen Kalla [Wed, 23 Sep 2009 18:18:35 +0000 (11:18 -0700)]
ril.h: Add a failure cause for CDMA call failures, rename
RIL_REQUEST_CDMA_VALIDATE_AKEY and minor clarifications
in the interface definitions.
Add failure cause for CDMA call failures due to access blocked by the
network. Specify the fields in RIL_REQUEST_REGISTRATION_STATE response
that are applicable to EVDO. Rename RIL_REQUEST_CDMA_VALIDATE_AKEY to
RIL_REQUEST_VALIDATE_AND_WRITE_AKEY. Elaborate the meaning of Akey in the
RIL_REQUEST_CDMA_VALIDATE_AND_WRITE_AKEY message.
John Wang [Sun, 20 Sep 2009 20:57:25 +0000 (13:57 -0700)]
am
5d621da5: Add UNSOL_CALL_RINGBACK_TONE to ril.
Merge commit '
5d621da539abea83309d77317ede40126f47d5f0' into eclair-plus-aosp
* commit '
5d621da539abea83309d77317ede40126f47d5f0':
Add UNSOL_CALL_RINGBACK_TONE to ril.
John Wang [Sat, 19 Sep 2009 00:17:48 +0000 (17:17 -0700)]
Add UNSOL_CALL_RINGBACK_TONE to ril.
Some networks may not play ring back tone, RIL will send UNSOL ringback notification.
It indicates to play tone to user for receiving ALERTING message.
johnwang [Sun, 20 Sep 2009 17:14:58 +0000 (10:14 -0700)]
am
e0ba6a98: Update comment of Neighboring Cell.
Merge commit '
e0ba6a98408e1efd3d1d1043d75f0ab53daddaaa' into eclair-plus-aosp
* commit '
e0ba6a98408e1efd3d1d1043d75f0ab53daddaaa':
Update comment of Neighboring Cell.
johnwang [Sat, 12 Sep 2009 02:14:52 +0000 (19:14 -0700)]
Update comment of Neighboring Cell.
johnwang [Fri, 11 Sep 2009 23:02:13 +0000 (16:02 -0700)]
am
bfb151ba: Update comment for CDMA_SEND_SMS in ril.h
Merge commit '
bfb151ba844bb97d8b21e827c0cb1556082151fa' into eclair-plus-aosp
* commit '
bfb151ba844bb97d8b21e827c0cb1556082151fa':
Update comment for CDMA_SEND_SMS in ril.h
johnwang [Fri, 11 Sep 2009 22:20:38 +0000 (15:20 -0700)]
Update comment for CDMA_SEND_SMS in ril.h
Update the comment of error class in CDMA_SEND_SMS to better document possible errors.
Tammo Spalink [Fri, 11 Sep 2009 06:03:27 +0000 (23:03 -0700)]
am
8e3a2cad: Document CDMA messageRef value.
Merge commit '
8e3a2cad4ed875394c833124df98255b1fd18a77' into eclair-plus-aosp
* commit '
8e3a2cad4ed875394c833124df98255b1fd18a77':
Document CDMA messageRef value.
Tammo Spalink [Fri, 11 Sep 2009 03:26:30 +0000 (11:26 +0800)]
Document CDMA messageRef value.
Change-Id: Iad417c2449a8b3d5b8bce7f42ff698ab62988e47
Jean-Baptiste Queru [Tue, 1 Sep 2009 15:28:16 +0000 (08:28 -0700)]
merge from open-source master
Wink Saville [Fri, 28 Aug 2009 18:16:03 +0000 (11:16 -0700)]
Add comment to RIL_UNSOL_CALL_RING.
Document the expected behavior and the new system properties
ro.telephony.call_ring.multiple and ro.telephony.call_ring.delay.
Change-Id: I600358ea29a31cafba99c58492003b7c2c6f77ed
Li Zhe [Tue, 4 Aug 2009 05:14:34 +0000 (13:14 +0800)]
HSDPA/HSUPA/HSPA support in ril.
HSDPA: High-Speed Downlink Packet Access
HSUPA: High-Speend Uplink Packet Access
HSPA: High-Speed Packet Access
Changes include:
1) add HSDPA/HSUPA/HSPA in response of RIL_REQUEST_REGISTRATION_STATE
2) rdd HSDPA/HSUPA/HSPA in response of RIL_REQUEST_GPRS_REGISTRATION_STATE
Jaikumar Ganesh [Tue, 18 Aug 2009 23:40:29 +0000 (16:40 -0700)]
Release mutex locks on error conditions.
Kenny [Wed, 12 Aug 2009 16:45:53 +0000 (00:45 +0800)]
fix return value check issue in sendResponseRaw function
Kenny [Wed, 12 Aug 2009 16:45:53 +0000 (00:45 +0800)]
fix return value check issue in sendResponseRaw function
Jean-Baptiste Queru [Tue, 4 Aug 2009 16:00:28 +0000 (09:00 -0700)]
merge from open-source master
Jean-Baptiste Queru [Mon, 3 Aug 2009 14:45:46 +0000 (07:45 -0700)]
merge from donut
John Wang [Thu, 30 Jul 2009 23:07:42 +0000 (16:07 -0700)]
John Wang [Thu, 30 Jul 2009 21:53:23 +0000 (14:53 -0700)]
Clean RIL_SIM_* in ril.h
GET_SIM_STATUS returns structure RIL_CardStatus instead of an integer of RIL_SIM_*. Update reference-ril for RIL_CardStatus and cleanup RIL_SIM_*.
modified: include/telephony/ril.h
modified: reference-ril/reference-ril.c
johnwang [Thu, 30 Jul 2009 06:34:48 +0000 (23:34 -0700)]
Update comments on SID/NID format.
modified: include/telephony/ril.h
Jean-Baptiste Queru [Wed, 29 Jul 2009 21:57:05 +0000 (14:57 -0700)]
merge from donut
Jean-Baptiste Queru [Sun, 26 Jul 2009 18:43:55 +0000 (11:43 -0700)]
reconcile korg/master into goog/master
Jean-Baptiste Queru [Sun, 26 Jul 2009 00:48:03 +0000 (17:48 -0700)]
Merge korg/donut into korg/master
johnwang [Thu, 23 Jul 2009 22:51:21 +0000 (15:51 -0700)]
Add comments for CDMA_SUBSCRIPTION
The SID and NID in CDMA_SUBSCRIPTION are represented in hexadecimal format (See bug #
1997056).
modified: ril.h
jsh [Thu, 16 Jul 2009 01:15:21 +0000 (18:15 -0700)]
am
29be25c1: Minor tweak to RIL_REQUEST_CDMA_SUBSCRIPTION
Merge commit '
29be25c17885e6c7c32b6aea293d689d5b9fb463'
* commit '
29be25c17885e6c7c32b6aea293d689d5b9fb463':
Minor tweak to RIL_REQUEST_CDMA_SUBSCRIPTION
jsh [Wed, 15 Jul 2009 03:18:59 +0000 (20:18 -0700)]
Minor tweak to RIL_REQUEST_CDMA_SUBSCRIPTION
H_SID and H_NID now returned as comma separated lists instead of single
value, since the home network may be comprised of more than one SID/NID.
Also update description of registration denied cause and manual network
selection.
jsh [Sun, 12 Jul 2009 13:06:58 +0000 (06:06 -0700)]
am
602f80f9: (Hopefully) final updates to ril.h for donut.
Merge commit '
602f80f98a06a8ed009a6c9b9aa3e0bcfc4afb23'
* commit '
602f80f98a06a8ed009a6c9b9aa3e0bcfc4afb23':
(Hopefully) final updates to ril.h for donut.
jsh [Fri, 10 Jul 2009 22:44:37 +0000 (15:44 -0700)]
(Hopefully) final updates to ril.h for donut.
Some new error values; additional parameters for BURST_DTMF.
John Wang [Thu, 2 Jul 2009 00:27:43 +0000 (17:27 -0700)]
am
6f189a6a: Fix bug
1687659 - cell id in reference ril.
Merge commit '
6f189a6a1b53adfa9570cf5911c3f81ef1b1fcf8'
* commit '
6f189a6a1b53adfa9570cf5911c3f81ef1b1fcf8':
Fix bug
1687659 - cell id in reference ril.
John Wang [Tue, 30 Jun 2009 20:12:53 +0000 (13:12 -0700)]
Fix bug
1687659 - cell id in reference ril.
The LAC and CID of RIL_REQUEST_REGISTRATION_STATE should be in the hex format. The valid LAC are from 0x0000 to 0xffff and Valid CID are from 0x00000000 to 0xffffffff. reference-ril should return hex value instead of decimal one.
modified: reference-ril/reference-ril.c
jsh [Thu, 25 Jun 2009 00:39:08 +0000 (17:39 -0700)]
am
593c910c: Update comments for PIN/PUK commands.
Merge commit '
593c910c9a98973ff1be5afe39987bafaa546170'
* commit '
593c910c9a98973ff1be5afe39987bafaa546170':
Update comments for PIN/PUK commands.
jsh [Wed, 24 Jun 2009 23:13:44 +0000 (16:13 -0700)]
Update comments for PIN/PUK commands.
These now have a response value.
jsh [Mon, 22 Jun 2009 17:05:29 +0000 (10:05 -0700)]
am
09a68ba3: Add remaining retry count to response for PIN/PUK commands.
Merge commit '
09a68ba315ca3d6b092fd8078cc42b93b7934a1a'
* commit '
09a68ba315ca3d6b092fd8078cc42b93b7934a1a':
Add remaining retry count to response for PIN/PUK commands.
jsh [Wed, 10 Jun 2009 18:56:38 +0000 (11:56 -0700)]
Add remaining retry count to response for PIN/PUK commands.
RIL_REQUEST_ENTER_SIM_PIN
RIL_REQUEST_ENTER_SIM_PUK
RIL_REQUEST_ENTER_SIM_PIN2
RIL_REQUEST_ENTER_SIM_PUK2
RIL_REQUEST_CHANGE_SIM_PIN
RIL_REQUEST_CHANGE_SIM_PIN2
RIL_REQUEST_SET_FACILITY_LOCK
RIL_ENTER_NETWORK_DEPERSONALIZATION
Also add requestToString entry for REPORT_SMS_MEMORY_STATUS.
Jaikumar Ganesh [Tue, 16 Jun 2009 17:28:57 +0000 (10:28 -0700)]
Jaikumar Ganesh [Mon, 4 May 2009 18:09:46 +0000 (11:09 -0700)]
Add PDP failure cause.
The RIL API LAST_PDP_FAIL_CAUSE, gives us the error
codes for PDP falure. Add these to ril.h.
Jaikumar Ganesh [Wed, 10 Jun 2009 18:37:21 +0000 (11:37 -0700)]
am
920c78f1: Add authType to SETUP_DATA_CALL, errorCode to RIL_SMS_Response.
Merge commit '
920c78f166e787dc799bf5df7d6be30034ac0e77'
* commit '
920c78f166e787dc799bf5df7d6be30034ac0e77':
Add authType to SETUP_DATA_CALL, errorCode to RIL_SMS_Response.
Jaikumar Ganesh [Thu, 4 Jun 2009 17:53:15 +0000 (10:53 -0700)]
Add authType to SETUP_DATA_CALL, errorCode to RIL_SMS_Response.
1.Add an additional parameter to specify the
authType (PAP / CHAP) to SETUP_DATA_CALL.
2.Add errorCode to RIL_SMS_Response
Wink Saville [Wed, 10 Jun 2009 01:10:02 +0000 (18:10 -0700)]
Wink Saville [Tue, 9 Jun 2009 17:23:37 +0000 (10:23 -0700)]
Cleanup whitespace.
Wink Saville [Tue, 9 Jun 2009 06:05:24 +0000 (23:05 -0700)]
am
2641d5b8: Add RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING.
Merge commit '
2641d5b8426beb86870611e5bc7c4eb0a877025b'
* commit '
2641d5b8426beb86870611e5bc7c4eb0a877025b':
Add RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING.
Wink Saville [Tue, 9 Jun 2009 00:40:42 +0000 (17:40 -0700)]
Add RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING.
Also add RIL_REQUEST_REPORT_SMS_MEMORY_STATUS which was missing from ril_commands.h.
Wink Saville [Sat, 6 Jun 2009 04:17:47 +0000 (21:17 -0700)]
am
d4ee7dc0: Add a fifth response string to RIL_REQUEST_CDMA_SUBSCRIPTION which has the PRL version.
Merge commit '
d4ee7dc0e98de1aa990e6c8a63f639779f9a86e9'
* commit '
d4ee7dc0e98de1aa990e6c8a63f639779f9a86e9':
Add a fifth response string to RIL_REQUEST_CDMA_SUBSCRIPTION which has the PRL version.
Wink Saville [Fri, 5 Jun 2009 22:11:30 +0000 (15:11 -0700)]
Add a fifth response string to RIL_REQUEST_CDMA_SUBSCRIPTION which has the PRL version.
johnwang [Wed, 3 Jun 2009 01:21:50 +0000 (18:21 -0700)]
am
b2a6184e: Allow response payload on RIL_REQUEST error
Merge commit '
b2a6184ec942c4c1728cbac723db90fbed4f85c5'
* commit '
b2a6184ec942c4c1728cbac723db90fbed4f85c5':
Allow response payload on RIL_REQUEST error
johnwang [Tue, 2 Jun 2009 21:55:45 +0000 (14:55 -0700)]
Allow response payload on RIL_REQUEST error
Enable response payload while RIL_REQUEST returns error. RIL must explicitly pass NULL
for the response parameter if there is no response payload.
modified: ril.cpp
jsh [Fri, 29 May 2009 22:17:26 +0000 (15:17 -0700)]
am
b60444ef: Support for SMS error reporting to the network.
Merge commit '
b60444ef2fe63b372e13f3d38ebf8448d6c127f5'
* commit '
b60444ef2fe63b372e13f3d38ebf8448d6c127f5':
Support for SMS error reporting to the network.
jsh [Fri, 29 May 2009 18:09:17 +0000 (11:09 -0700)]
Support for SMS error reporting to the network.
- Update RIL_REQUEST_SMS_ACKNOWLDGE to report fail cause.
- Update comments for RIL_CMDA_SMS_Ack.
- Add RIL_REQUEST_REPORT_SMS_MEMORY_STATUS.
Wink Saville [Fri, 29 May 2009 03:30:43 +0000 (20:30 -0700)]
am
a592eebc: Cleanup and changes of responseCdmaInformationReocrds, Broadcast SMS configuration and reponseRilSignalStrength.
Merge commit '
a592eebc476a3d234f47f93e58252f8c822fc772'
* commit '
a592eebc476a3d234f47f93e58252f8c822fc772':
Cleanup and changes of responseCdmaInformationReocrds, Broadcast SMS
Wink Saville [Fri, 22 May 2009 20:26:36 +0000 (13:26 -0700)]
Cleanup and changes of responseCdmaInformationReocrds, Broadcast SMS
configuration and reponseRilSignalStrength.
From Motorola, change reponseCdmaInformationRecords to use string for
marshalling and simplify by removing duplicate code.
Change Broadcast SMS configuration adding some some new fields
for Gsm Broadcast configuration and some name changes to be
more coherent.
Cleanup responseRilSignalStrength, includes some code refactoring
and removing the sending of the number of intergers. Now it is assumed
that a RIL_SignalStrength structure being sent so it is not necessary to
send the length. There is a corresponding change in
frameworks/base/telephony/java/com/android/internal/telephony/RIL.java.
johnwang [Tue, 26 May 2009 21:55:36 +0000 (14:55 -0700)]
am
fdf825f9: Enable new libhtc_ril which supporting new CDMA ril interface.
Merge commit '
fdf825f9d0dc639787b8523638bb61874ed0b540'
* commit '
fdf825f9d0dc639787b8523638bb61874ed0b540':
Enable new libhtc_ril which supporting new CDMA ril interface.
johnwang [Fri, 22 May 2009 22:50:34 +0000 (15:50 -0700)]
Enable new libhtc_ril which supporting new CDMA ril interface.
1) Enable new libhtc_ril and support new RIL_Call structure 2) Remove "#define NEWRIL".
Mathias Agopian [Wed, 20 May 2009 02:11:50 +0000 (19:11 -0700)]
move libbinder's header files under includes/binder
Mathias Agopian [Wed, 20 May 2009 00:29:08 +0000 (17:29 -0700)]
add libbinder deps where needed
Wink Saville [Tue, 19 May 2009 06:56:11 +0000 (23:56 -0700)]
Wink Saville [Tue, 19 May 2009 01:00:44 +0000 (18:00 -0700)]
Teleca 2b changes.
johnwang [Sat, 16 May 2009 00:24:36 +0000 (17:24 -0700)]
am
f8bc1675: Update comments in ril.h to clarify the format in RIL_SMS_WriteArgs and deprecate RIL_REQUEST_RESET_RADIO. Fix couple typo.
Merge commit '
f8bc167551e4a5af4c22dab4855468a166b9ed30'
* commit '
f8bc167551e4a5af4c22dab4855468a166b9ed30':
Update comments in ril.h to clarify the format in RIL_SMS_WriteArgs and deprecate RIL_REQUEST_RESET_RADIO. Fix couple typo.
johnwang [Fri, 15 May 2009 02:19:47 +0000 (19:19 -0700)]
Update comments in ril.h to clarify the format in RIL_SMS_WriteArgs and deprecate RIL_REQUEST_RESET_RADIO. Fix couple typo.
jsh [Tue, 12 May 2009 01:26:38 +0000 (18:26 -0700)]
am
000a9fe: Add get/set SMSC address to ril.h.
Merge commit '
000a9fe96fdf9111387d2bc389d2f6bb3e627d0f'
* commit '
000a9fe96fdf9111387d2bc389d2f6bb3e627d0f':
Add get/set SMSC address to ril.h.
jsh [Mon, 11 May 2009 21:52:35 +0000 (14:52 -0700)]
Add get/set SMSC address to ril.h.
Android (Google) Code Review [Fri, 1 May 2009 06:51:19 +0000 (23:51 -0700)]
am
6b65348: Merge change 744 into donut
Merge commit '
6b6534839eb7a2a0a94f5f828bb81d0399b7446a'
* commit '
6b6534839eb7a2a0a94f5f828bb81d0399b7446a':
Add RIL_UNSOL_OEM_HOOK_RAW
Android (Google) Code Review [Fri, 1 May 2009 01:59:48 +0000 (18:59 -0700)]
Merge change 744 into donut
* changes:
Add RIL_UNSOL_OEM_HOOK_RAW
Wink Saville [Fri, 1 May 2009 01:55:28 +0000 (18:55 -0700)]
am
f6aa7c1: Handle RIL_REQUEST_GET_SIM_STATUS as per the new ril.h speci
Merge commit '
f6aa7c1c8a9531a254970f85860d74cdd033821c'
* commit '
f6aa7c1c8a9531a254970f85860d74cdd033821c':
Handle RIL_REQUEST_GET_SIM_STATUS as per the new ril.h specification.
Wink Saville [Thu, 30 Apr 2009 21:20:52 +0000 (14:20 -0700)]
Handle RIL_REQUEST_GET_SIM_STATUS as per the new ril.h specification.
Wink Saville [Thu, 30 Apr 2009 04:22:11 +0000 (21:22 -0700)]
am
4a24d11: Partially fix
1820187 by using RIL_CallOld since we\'re not
Merge commit '
4a24d11778bff3f2b4b99eb03b0dfafa6c3c059c'
* commit '
4a24d11778bff3f2b4b99eb03b0dfafa6c3c059c':
Partially fix
1820187 by using RIL_CallOld since we're not
Jaikumar Ganesh [Wed, 29 Apr 2009 20:27:51 +0000 (13:27 -0700)]
Add RIL_UNSOL_OEM_HOOK_RAW
Add RIL_UNSOL_OEM_HOOK_RAW to send unsolicited OEM
commands from the baseband.
Tested using radiooptions tool.
Wink Saville [Wed, 29 Apr 2009 22:53:39 +0000 (15:53 -0700)]
Partially fix
1820187 by using RIL_CallOld since we're not
yet fully switched to the new ril.h.
This is only partially fixed because there is an opposite
problem with getSIMStatus in reference-ril.c. Here we should
be returning the new RIL_CardStatus but we're returning the
just the integer. This will be fixed in a subsequent Change.
Wink Saville [Wed, 29 Apr 2009 20:43:11 +0000 (13:43 -0700)]
am
f5903df: Teleca 090414 & 090423 patches for CDMA to complete phase1 w
Merge commit '
f5903dfd25c2ef104b3e9267b53f6ee3e7588063'
* commit '
f5903dfd25c2ef104b3e9267b53f6ee3e7588063':
Teleca 090414 & 090423 patches for CDMA to complete phase1 work.
Wink Saville [Fri, 24 Apr 2009 18:54:14 +0000 (11:54 -0700)]
Teleca 090414 & 090423 patches for CDMA to complete phase1 work.
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:17 +0000 (18:33 -0700)]
Merge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:28:01 +0000 (18:28 -0700)]
Merge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:59 +0000 (17:56 -0700)]
merge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:35 +0000 (17:12 -0700)]
Merge donut into master
Wink Saville [Wed, 22 Apr 2009 21:50:00 +0000 (14:50 -0700)]
New ril.h & changes to ril.cpp to support it.
There are NEWRIL:TODO's in the code to identify
additional changes needed when a new vendor ril
is delivered.
Also changes to some appendPrintBuf's, apparently
it's been a while since debug has been turn on
as there were quite a few compile time errors.
Wink Saville [Sat, 4 Apr 2009 01:05:36 +0000 (18:05 -0700)]
Merge branch 'readonly-p4-master'
Wink Saville [Sat, 4 Apr 2009 01:04:25 +0000 (18:04 -0700)]
AI 144571: am: CL 144570 Fix some non-sequential RIL commands.
RIL_REQUEST_CDMA_SUBSCRITION ... RIL_REQUEST_DEVICE_IDENTLY changed
from 99 .. 102 to 95 to 98 so they directly follow
RIL_REQUEST_CDMA_BROADCAST_ACTIVATION which is 94. These values are
used as indexes into s_commands an array of CommandInfo which
is a non-sparse arrary so there should be no gap.
Original author: wink
Automated import of CL 144571
Wink Saville [Sat, 4 Apr 2009 01:02:34 +0000 (18:02 -0700)]
AI 144570: Fix some non-sequential RIL commands.
RIL_REQUEST_CDMA_SUBSCRITION ... RIL_REQUEST_DEVICE_IDENTLY changed
from 99 .. 102 to 95 to 98 so they directly follow
RIL_REQUEST_CDMA_BROADCAST_ACTIVATION which is 94. These values are
used as indexes into s_commands an array of CommandInfo which
is a non-sparse arrary so there should be no gap.
BUG=
1765265
Automated import of CL 144570
Wink Saville [Thu, 2 Apr 2009 18:02:15 +0000 (11:02 -0700)]
Merge branch 'readonly-p4-master'
Wink Saville [Thu, 2 Apr 2009 18:00:56 +0000 (11:00 -0700)]
AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
Wink Saville [Thu, 2 Apr 2009 08:37:03 +0000 (01:37 -0700)]
AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
The Android Open Source Project [Sun, 29 Mar 2009 15:55:10 +0000 (08:55 -0700)]
Merge branch 'open_source_no_contributions' into google_internal
Mike Lockwood [Sat, 28 Mar 2009 02:01:43 +0000 (19:01 -0700)]
AI 143349: am: CL 143198 am: CL 142968 Remove showlease, wpa_cli and radiooptions tools from user builds.
Should save us 52K in /system
BUG=
1739507
Original author: lockwood
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143349
Mike Lockwood [Sat, 28 Mar 2009 00:32:57 +0000 (17:32 -0700)]
AI 143198: am: CL 142968 Remove showlease, wpa_cli and radiooptions tools from user builds.
Should save us 52K in /system
BUG=
1739507
Original author: lockwood
Merged from: //branches/cupcake/...
Automated import of CL 143198
The Android Open Source Project [Fri, 27 Mar 2009 22:31:11 +0000 (15:31 -0700)]
Merge commit 'korg/cupcake'
Mike Lockwood [Thu, 26 Mar 2009 19:50:55 +0000 (12:50 -0700)]
Automated import from //branches/cupcake/...@142968,142968
John Wang [Wed, 25 Mar 2009 00:59:06 +0000 (17:59 -0700)]
Automated import from //branches/master/...@140575,140575
John Wang [Wed, 25 Mar 2009 00:56:29 +0000 (17:56 -0700)]
Automated import from //branches/donutburger/...@140572,140572
The Android Open Source Project [Fri, 20 Mar 2009 06:08:56 +0000 (23:08 -0700)]
auto import from //branches/cupcake_rel/...@141571
The Android Open Source Project [Thu, 19 Mar 2009 00:39:47 +0000 (17:39 -0700)]
auto import from //branches/cupcake_rel/...@140373
Jean-Baptiste Queru [Wed, 18 Mar 2009 00:37:30 +0000 (17:37 -0700)]
Merge commit 'remotes/korg/cupcake' into merge