OSDN Git Service
Chih-Hung Hsieh [Wed, 29 Jun 2016 19:47:32 +0000 (19:47 +0000)]
Merge \\\"Fix misc-macro-parentheses warnings in hardware/ril.\\\" am:
1648a3f50b am:
929b0a7e35
am:
d335e16728
Change-Id: I18bd42641b83ef439357c9211496aa11c19a2f41
Chih-Hung Hsieh [Wed, 29 Jun 2016 19:44:50 +0000 (19:44 +0000)]
Merge \\"Fix misc-macro-parentheses warnings in hardware/ril.\\" am:
1648a3f50b
am:
929b0a7e35
Change-Id: Ifb4169b780d050fab31f0987dca810cada7307ce
Chih-Hung Hsieh [Wed, 29 Jun 2016 19:42:26 +0000 (19:42 +0000)]
Merge \"Fix misc-macro-parentheses warnings in hardware/ril.\"
am:
1648a3f50b
Change-Id: Ib880298fc4001e0befe10582e9f6e5c792d1bd69
Treehugger Robot [Wed, 29 Jun 2016 19:31:52 +0000 (19:31 +0000)]
Merge "Fix misc-macro-parentheses warnings in hardware/ril."
Chih-Hung Hsieh [Wed, 29 Jun 2016 18:22:36 +0000 (11:22 -0700)]
Fix misc-macro-parentheses warnings in hardware/ril.
Add parentheses around negative literals.
Bug:
28705665
Test: build with clang-tidy
Change-Id: I038c7cbf3728a4e9ccc20d8c7317ddae3fa9b571
Meng Wang [Mon, 27 Jun 2016 21:07:53 +0000 (21:07 +0000)]
Merge \"Fix compile warning in libril.cpp\" into nyc-mr1-dev
am:
4ada88aeb5
Change-Id: Ica2aaca0c7ba313ee3e97d627c10daa702896064
TreeHugger Robot [Mon, 27 Jun 2016 20:54:55 +0000 (20:54 +0000)]
Merge "Fix compile warning in libril.cpp" into nyc-mr1-dev
Ajay Nambi [Thu, 23 Jun 2016 18:53:10 +0000 (18:53 +0000)]
Add support for LTE CarrierAgregation
am:
6dbb43ca9a
Change-Id: I1f4ffab284b6952b2f196e5ecec74cb6b27a7b1b
David 'Digit' Turner [Thu, 23 Jun 2016 09:15:01 +0000 (11:15 +0200)]
resolve merge conflicts of
d027477 to nyc-mr1-dev-plus-aosp
Change-Id: I7d0ddf2cf04ed35b3541b99955561203181367fb
David Turner [Thu, 23 Jun 2016 08:43:13 +0000 (08:43 +0000)]
resolve merge conflicts of
ccd27b0 to stage-aosp-master
am:
25d580912d
Change-Id: I7afa0604b98b90256c47e806fbb8e11d9ac98594
David 'Digit' Turner [Thu, 23 Jun 2016 08:35:49 +0000 (10:35 +0200)]
resolve merge conflicts of
ccd27b0 to stage-aosp-master
Change-Id: Ic5a6bb461c60646d7f9798cb1bf99110c6592f91
David Turner [Thu, 23 Jun 2016 07:52:29 +0000 (07:52 +0000)]
Merge "Simplify emulator-specific logic."
David 'Digit' Turner [Wed, 22 Jun 2016 10:10:01 +0000 (12:10 +0200)]
Simplify emulator-specific logic.
Remove any qemu-specific code from rild.c, this now handled
by setting rild.libpath properly in the init.<board>.rc files
for emulator-specific build products.
Also, only the qemu pipe method is really supported since ICS
so remove obsolete schemes.
BUG=
25875346
Change-Id: I82296c127b90c230ca1446ee2431f06e78def617
Meng Wang [Tue, 21 Jun 2016 00:38:18 +0000 (17:38 -0700)]
Fix compile warning in libril.cpp
Bug:
29401612
Change-Id: Ifb04928fce7f2e028c0f69d6cdbb1dce0befeadf
David 'Digit' Turner [Tue, 21 Jun 2016 08:10:35 +0000 (08:10 +0000)]
Merge \\\"[qemu]: Use new <system/qemu_pipe.h> header.\\\" am:
47a81105da am:
c963b671f3
am:
12db6c3cf4
Change-Id: Ie9eb87da94a47d90994294dd1ac2f743bf5cfe54
David Turner [Tue, 21 Jun 2016 08:08:00 +0000 (08:08 +0000)]
Merge \\"[qemu]: Use new <system/qemu_pipe.h> header.\\" am:
47a81105da
am:
c963b671f3
Change-Id: Id5a2b977a6867537a51f3f740a7df28aca441a4d
David 'Digit' Turner [Tue, 21 Jun 2016 08:05:15 +0000 (08:05 +0000)]
Merge \"[qemu]: Use new <system/qemu_pipe.h> header.\"
am:
47a81105da
Change-Id: I3d5e17d7c9468321273bf9540548ef12d931c91d
David Turner [Tue, 21 Jun 2016 07:38:01 +0000 (07:38 +0000)]
Merge "[qemu]: Use new <system/qemu_pipe.h> header."
Ajay Nambi [Fri, 15 May 2015 01:50:20 +0000 (18:50 -0700)]
Add support for LTE CarrierAgregation
Note this may be redesigned in O to better handle the
various bitrate/channel combinations in a sane way.
bug:
27360321
Change-Id: I36a548b3229bf344ac2e4b714d8dc1dfa47af064
David 'Digit' Turner [Thu, 16 Jun 2016 17:00:05 +0000 (19:00 +0200)]
[qemu]: Use new <system/qemu_pipe.h> header.
BUG=
25875346
Change-Id: Ie8649caa43a77a4ea1399df673cce2682773e4df
Robert Greenwalt [Thu, 16 Jun 2016 00:15:19 +0000 (00:15 +0000)]
Merge \"Move struct def out of an #ifdef\" into nyc-mr1-dev
am:
a976a8221f
Change-Id: I415eb2ea039d2c147ced33fa2c21d5bde1c09b82
Robert Greenwalt [Thu, 16 Jun 2016 00:08:06 +0000 (00:08 +0000)]
Merge "Move struct def out of an #ifdef" into nyc-mr1-dev
Robert Greenwalt [Wed, 15 Jun 2016 21:59:38 +0000 (14:59 -0700)]
Move struct def out of an #ifdef
It was only visible if the vendor used a particular
style (SHLIB).
bug:
28961371
bug:
28567303
Change-Id: I54256e17170a69bdb6fbb9b38924b42906b85896
Meng Wang [Thu, 9 Jun 2016 22:59:07 +0000 (22:59 +0000)]
Fix responseCarrierRestrictions string wrting to parcel
am:
b460ba8ecc
Change-Id: If4f661b2e6030d02fde3a7b83bf437ed1dc9691a
Meng Wang [Thu, 9 Jun 2016 16:21:26 +0000 (09:21 -0700)]
Fix responseCarrierRestrictions string wrting to parcel
In Java land, string are read from parcel by readString16.
Hence writeString16 should be invoked in C land,
instead of writeCString
Bug:
28564314
Change-Id: I0ede376541b54d72867f07b96ae52c4a8ed3695f
Meng Wang [Wed, 8 Jun 2016 22:23:53 +0000 (22:23 +0000)]
Merge \"Fix dispatchCarrierRestrictions string reading from parcel\" into nyc-mr1-dev
am:
6d445bb4a1
Change-Id: I1e37eff0f97583b7eeaab306157eb8fbded974fd
Meng Wang [Wed, 8 Jun 2016 22:15:11 +0000 (22:15 +0000)]
Merge "Fix dispatchCarrierRestrictions string reading from parcel" into nyc-mr1-dev
Android Build Merger (Role) [Wed, 8 Jun 2016 21:34:01 +0000 (21:34 +0000)]
Merge "Fix build failure which occurs after setting macro RILC_LOG. am:
626099ec9b am:
4d43056697" into nyc-mr1-dev-plus-aosp
Sanket Padawe [Wed, 8 Jun 2016 21:33:51 +0000 (21:33 +0000)]
Fix build failure which occurs after setting macro RILC_LOG. am:
626099ec9b
am:
075aa9baca
Change-Id: I8623e9d123f7eb04022a1a7444d07de81faf1b5f
Sanket Padawe [Wed, 8 Jun 2016 21:33:51 +0000 (21:33 +0000)]
Fix build failure which occurs after setting macro RILC_LOG. am:
626099ec9b
am:
4d43056697
Change-Id: I35fbf9b0ac7ddf7704df51b9adda65f82d022203
Sanket Padawe [Wed, 8 Jun 2016 21:31:20 +0000 (21:31 +0000)]
Fix build failure which occurs after setting macro RILC_LOG.
am:
626099ec9b
Change-Id: I193a57f676a81a5835d4506550f94278cbc127cc
Sanket Padawe [Wed, 8 Jun 2016 21:31:20 +0000 (21:31 +0000)]
Fix build failure which occurs after setting macro RILC_LOG.
am:
626099ec9b
Change-Id: Ib31836f36366246e3229635ceee3fa04e6a404f8
Sanket Padawe [Wed, 8 Jun 2016 21:09:26 +0000 (14:09 -0700)]
Fix build failure which occurs after setting macro RILC_LOG.
Bug:
29214796
Change-Id: I5f74981a59344078f900ecf769cc962b1416d5fd
Meng Wang [Wed, 8 Jun 2016 18:53:25 +0000 (11:53 -0700)]
Fix dispatchCarrierRestrictions string reading from parcel
The parcel is passed from Java land where string are write to
parcel by writeString16. In C land, the string should be read
by readString16 instead of readCString.
Bug:
28564314
Change-Id: Ib6d9f0fd3895c7836bd9d7c2df879269bb29ae4e
Sanket Padawe [Wed, 8 Jun 2016 17:14:15 +0000 (17:14 +0000)]
Increase buffer size for storing /proc/cmdline to avoid buffer overflow.
am:
fcd7395ffc
Change-Id: I74b42d967e069d06676dd9e2ec9c01da63f21b84
Sanket Padawe [Mon, 6 Jun 2016 18:21:24 +0000 (11:21 -0700)]
Increase buffer size for storing /proc/cmdline to avoid buffer overflow.
Bug:
29115540
Change-Id: I875532f119aef908f7c7afbbd2224a5252c972ee
Michael Wright [Fri, 3 Jun 2016 19:02:17 +0000 (19:02 +0000)]
Merge "Don\'t clobber the last null terminator when reading /proc/cmdline." into nyc-mr1-dev
am:
a0b379fe68
* commit '
a0b379fe68152bedaa3b1eed1d84c5c4fbf11ae1':
Don't clobber the last null terminator when reading /proc/cmdline.
Change-Id: I6a970e2ecbabf33e0f02e7e189abc8c3e33a12f2
TreeHugger Robot [Fri, 3 Jun 2016 18:36:54 +0000 (18:36 +0000)]
Merge "Don't clobber the last null terminator when reading /proc/cmdline." into nyc-mr1-dev
Robert Greenwalt [Fri, 3 Jun 2016 16:45:51 +0000 (16:45 +0000)]
Add support for UNSOL PCO Data.
am:
27e99c5ab6
* commit '
27e99c5ab67cd997b29a88bbef0250b1f77ceda8':
Add support for UNSOL PCO Data.
Change-Id: I83cd610f0d9ce9fe0856783e65b63f458bbe409c
Michael Wright [Fri, 3 Jun 2016 15:09:53 +0000 (16:09 +0100)]
Don't clobber the last null terminator when reading /proc/cmdline.
Right now, if /proc/cmdline is larger than the buffer size (1024)
then the read will overwrite all of the null terminators and the
ensuing strstr calls will continue past the end of the buffer.
Bug:
29115540
Change-Id: I2da2f28edabd7926d40dbcea52ebaf7165c44e04
Robert Greenwalt [Wed, 1 Jun 2016 23:31:38 +0000 (16:31 -0700)]
Add support for UNSOL PCO Data.
bug:
28961371
bug:
28567303
Change-Id: Ibbb415c9f5799d666b1599ed0abf97ec24642a3a
Meng Wang [Thu, 26 May 2016 17:53:41 +0000 (17:53 +0000)]
ril: make sure ril response on RIL version error
am:
df8398cf7a
* commit '
df8398cf7a21d512d36d64d896f90e1d04bbc95f':
ril: make sure ril response on RIL version error
Change-Id: I6c9f6e711ca1f326f0b7fc50dad770e63aa0d3b1
Meng Wang [Wed, 25 May 2016 19:59:15 +0000 (12:59 -0700)]
ril: make sure ril response on RIL version error
Fix issue: in dispatchCarrierRestrictions(), when unsupported RIL
version detected, no RIL response is received.
Root cause: the error handling code doesn't send actual RIL request.
Solution: call RIL_onRequestComplete() so that RIL response with
designated error code like RIL_E_REQUEST_NOT_SUPPORTED.
Bug:
28564314
Change-Id: I3f91cf1d14f39813471b36f1fe4c4e0d9f6dbd60
Meng Wang [Fri, 20 May 2016 22:22:03 +0000 (22:22 +0000)]
Add RIL command RIL_REQUEST_SET_CARRIER_RESTRICTIONS and RIL_REQUEST_GET_CARRIER_RESTRICTIONS
am:
b4e343127f
* commit '
b4e343127f3bbf782a56849d80f7278c49c563ee':
Add RIL command RIL_REQUEST_SET_CARRIER_RESTRICTIONS and RIL_REQUEST_GET_CARRIER_RESTRICTIONS
Change-Id: I518f9b7cdf371b9e05c2aa33a1d1c76be2bce4de
Meng Wang [Thu, 12 May 2016 21:54:36 +0000 (14:54 -0700)]
Add RIL command RIL_REQUEST_SET_CARRIER_RESTRICTIONS and RIL_REQUEST_GET_CARRIER_RESTRICTIONS
Bug:
28564314
Change-Id: I38792d59c4602a3e2126c58ac0b8c2487cccff04
Chih-Hung Hsieh [Mon, 16 May 2016 19:41:30 +0000 (19:41 +0000)]
resolve merge conflicts of
c9badf1 to nyc-dev-plus-aosp
am:
78e2c9c17f
* commit '
78e2c9c17f922cd2c8b3116fa6b228ea990d8f4b':
Fix misc-macro-parentheses warnings.
Change-Id: I78cd4684a0cc020c6f85343f886b3868d7022c17
Robert Greenwalt [Mon, 16 May 2016 19:36:42 +0000 (12:36 -0700)]
resolve merge conflicts of
c9badf1 to nyc-dev-plus-aosp
Change-Id: I59d138a61554a2439577bcfdf400ea663c6bb91d
Chih-Hung Hsieh [Mon, 16 May 2016 18:50:38 +0000 (18:50 +0000)]
Merge "Fix misc-macro-parentheses warnings."
am:
e8505bf06e
* commit '
e8505bf06e2f17babe479230e62e6e7d1b8c4bca':
Fix misc-macro-parentheses warnings.
Change-Id: I40b3707b3206aff65312786db1899949a0ed6b53
Treehugger Robot [Mon, 16 May 2016 18:43:31 +0000 (18:43 +0000)]
Merge "Fix misc-macro-parentheses warnings."
Chih-Hung Hsieh [Thu, 12 May 2016 17:01:16 +0000 (10:01 -0700)]
Fix misc-macro-parentheses warnings.
Bug:
28705665
Change-Id: Ib7520c64075a652eb0b15483f36383c4632624d1
Sanket Padawe [Mon, 9 May 2016 19:28:23 +0000 (19:28 +0000)]
Merge "RIL: release unsol wakelock" into nyc-dev am:
22b45625aa
am:
56292f9d24
* commit '
56292f9d2481f4a073fdcae5fe71dbb7d1aadf65':
Change-Id: I5771e4997f3bf1da6ebe526e9aa49ae37caa9205
Sanket Padawe [Mon, 9 May 2016 19:27:29 +0000 (19:27 +0000)]
Merge "RIL: release unsol wakelock" into nyc-dev am:
22b45625aa
am:
63a8a6cd32
* commit '
63a8a6cd32d75857925fd54a2ecd173ddfa9322a':
RIL: release unsol wakelock
Change-Id: If0ccf116d156398f1d4a0b4cfda94f4490e2b07d
Sooraj Sasindran [Mon, 9 May 2016 19:21:55 +0000 (19:21 +0000)]
Merge "RIL: release unsol wakelock" into nyc-dev
am:
22b45625aa
* commit '
22b45625aa72ef9311bf23cd785eccce9535efa5':
RIL: release unsol wakelock
Change-Id: I24114554188c19eac5f3fc005d0ae118c7c3496e
Sooraj Sasindran [Mon, 9 May 2016 19:21:53 +0000 (19:21 +0000)]
Merge "RIL: release unsol wakelock" into nyc-dev
am:
22b45625aa
* commit '
22b45625aa72ef9311bf23cd785eccce9535efa5':
RIL: release unsol wakelock
Change-Id: I0930de5a9e29b1b66cd207a52ba2e558eeb3cff2
Sanket Padawe [Mon, 9 May 2016 19:08:41 +0000 (19:08 +0000)]
Merge "RIL: release unsol wakelock" into nyc-dev
Sooraj Sasindran [Fri, 6 May 2016 23:19:56 +0000 (16:19 -0700)]
RIL: release unsol wakelock
Make sure to release unsol wakelock
BUG=
28635279
Change-Id: I4bdf0e7b35df4e6aa077b062ab359c6938ce8292
Android Build Merger (Role) [Fri, 6 May 2016 03:31:13 +0000 (03:31 +0000)]
Merge "Specify the INVALID flag for BSIC to be 0xFF am:
f3769da0a3 am:
035f677577" into nyc-mr1-dev-plus-aosp
Nathan Harold [Fri, 6 May 2016 03:31:01 +0000 (03:31 +0000)]
Specify the INVALID flag for BSIC to be 0xFF am:
f3769da0a3
am:
035f677577
* commit '
035f6775779367eacd12b6e11c690341cc84b17f':
Specify the INVALID flag for BSIC to be 0xFF
Change-Id: I6c4de77a0839764bec8dc87924f41bfbdf562989
Nathan Harold [Fri, 6 May 2016 03:31:00 +0000 (03:31 +0000)]
Specify the INVALID flag for BSIC to be 0xFF am:
f3769da0a3
am:
8a6a67ad90
* commit '
8a6a67ad90745bea7e90c33b9817213af1b5636b':
Specify the INVALID flag for BSIC to be 0xFF
Change-Id: I0a1edf934ebe7269a97ea03379007af5fc5cbe32
Nathan Harold [Fri, 6 May 2016 03:26:12 +0000 (03:26 +0000)]
Specify the INVALID flag for BSIC to be 0xFF
am:
f3769da0a3
* commit '
f3769da0a39e2d8116d415f6fd1cba4f1648c03b':
Specify the INVALID flag for BSIC to be 0xFF
Change-Id: I77e3c5e8ed6283870d748900b1b6984d85138246
Nathan Harold [Fri, 6 May 2016 03:26:11 +0000 (03:26 +0000)]
Specify the INVALID flag for BSIC to be 0xFF
am:
f3769da0a3
* commit '
f3769da0a39e2d8116d415f6fd1cba4f1648c03b':
Specify the INVALID flag for BSIC to be 0xFF
Change-Id: I9676bb84fa15d888abda71ca73360d2f9805b106
Nathan Harold [Thu, 5 May 2016 19:19:39 +0000 (12:19 -0700)]
Specify the INVALID flag for BSIC to be 0xFF
Bug:
28299027
Change-Id: I3786265a266508d6ea842ccc2a2c3dcf99c3654f
Aurimas Liutikas [Fri, 29 Apr 2016 04:22:17 +0000 (04:22 +0000)]
Merge "Suppress unused-parameter warnings in libril." am:
a22b128851 am:
5eaec8ba33
am:
36dc009f87
* commit '
36dc009f87af46fa7e9780cdae25de2f2f6bd5bd':
Suppress unused-parameter warnings in libril.
Change-Id: I1d223c07c755f3452628af431505a0e484c0c211
Aurimas Liutikas [Fri, 29 Apr 2016 04:19:27 +0000 (04:19 +0000)]
Merge "Suppress unused-parameter warnings in libril." am:
a22b128851
am:
5eaec8ba33
* commit '
5eaec8ba3354075a2aa66b134a93bc851327cb57':
Suppress unused-parameter warnings in libril.
Change-Id: I859774e38c07c92634567e91ef129e38a4e1998d
Aurimas Liutikas [Fri, 29 Apr 2016 04:16:42 +0000 (04:16 +0000)]
Merge "Suppress unused-parameter warnings in libril."
am:
a22b128851
* commit '
a22b128851c769f18ab6e1dde38ef5a4c32c28c2':
Suppress unused-parameter warnings in libril.
Change-Id: I9c6d05fae4dbb4ff29c44146c7cc221fa1a44a50
Aurimas Liutikas [Fri, 29 Apr 2016 04:10:49 +0000 (04:10 +0000)]
Merge "Suppress unused-parameter warnings in libril."
Aurimas Liutikas [Fri, 29 Apr 2016 03:47:16 +0000 (20:47 -0700)]
Suppress unused-parameter warnings in libril.
Bug:
26936282
Change-Id: I848a9b2e98e31845d29cc84ccea3517d13339dcc
tim.tm_lin [Wed, 20 Apr 2016 23:41:06 +0000 (23:41 +0000)]
ril : print request name for RIL_REQUEST_NV_RESET_CONFIG
am:
da91641
* commit '
da91641ab90dfe94e73b75b726f35e44ad823e11':
ril : print request name for RIL_REQUEST_NV_RESET_CONFIG
Change-Id: Ia763affc261cf3fbd7866b24b6d9f43b838d460a
tim.tm_lin [Wed, 13 Apr 2016 16:59:57 +0000 (00:59 +0800)]
ril : print request name for RIL_REQUEST_NV_RESET_CONFIG
RIL_REQUEST_NV_RESET_CONFIG will be used for OMA DM
Bug:
27615197
Change-Id: I72319eff326436b9facaf8a702559685360cd7f3
Signed-off-by: tim.tm_lin <tim.tm_lin@htc.com>
Keun Soo Yim [Thu, 14 Apr 2016 02:10:48 +0000 (02:10 +0000)]
build fix
am:
1067bb6
* commit '
1067bb62f81e8c6b5df8fd0c16f7ee5a8179529a':
build fix
Change-Id: I742d5d9295b7b3ebdd57a68497fb771138844f71
Keun Soo Yim [Thu, 14 Apr 2016 02:06:26 +0000 (19:06 -0700)]
build fix
Change-Id: I52d7255c352f1a8188658d28f609e5028179d0a0
Keun Soo Yim [Thu, 14 Apr 2016 01:59:57 +0000 (01:59 +0000)]
Merge "fail explicitly if setuid() fails" into nyc-dev
am:
c23238d
* commit '
c23238d36e15225bade04710e78defadf9d0039e':
fail explicitly if setuid() fails
Change-Id: I6be3ecc549efc5279d590477fe91b74548707dea
Keun Soo Yim [Thu, 14 Apr 2016 01:59:57 +0000 (01:59 +0000)]
avoid a potential buffer overflow
am:
1973685
* commit '
1973685c095e3e15760d3ba4ad9e77997c46594a':
avoid a potential buffer overflow
Change-Id: Ib3792c7e229f2bda3244d68137e9e620069cd26c
Keun Soo Yim [Thu, 14 Apr 2016 01:47:26 +0000 (01:47 +0000)]
Merge "fail explicitly if setuid() fails" into nyc-dev
Keun Soo Yim [Thu, 14 Apr 2016 00:17:52 +0000 (17:17 -0700)]
fail explicitly if setuid() fails
otherwise, the following code can be executed
with unintended privileges.
bug:
28178548
Change-Id: I265f8c0e1693344a675cc2623968db816309b1f4
Keun Soo Yim [Thu, 14 Apr 2016 00:11:20 +0000 (17:11 -0700)]
avoid a potential buffer overflow
strncat can copy upto n bytes if its 3rd argument is n,
while the 1st argument which is the destination has only n bytes
in this case.
Change-Id: I3469abdcf55e64c5878a855700b323335c40c8be
Yu Ning [Fri, 8 Apr 2016 01:01:39 +0000 (01:01 +0000)]
reference-ril: Stop using pthread_cond_timedwait_relative_np()
am:
f3769c1
* commit '
f3769c17615bc9c227cff83cad0e55bb9f878197':
reference-ril: Stop using pthread_cond_timedwait_relative_np()
Change-Id: Id11534397b2360c2dffa00eede02a4447c6e1030
Jinhui Li [Fri, 8 Apr 2016 01:01:39 +0000 (01:01 +0000)]
reference-ril/atchannel.c: Fix time conversion
am:
99f6a4e -s ours
* commit '
99f6a4e8fa12a6d54df5420aaa3eda29d9ba22a6':
reference-ril/atchannel.c: Fix time conversion
Change-Id: I41ebd943fda8e72aa7eaa19c4159c441e2f1fe64
Yu Ning [Thu, 31 Mar 2016 13:49:59 +0000 (21:49 +0800)]
reference-ril: Stop using pthread_cond_timedwait_relative_np()
pthread_cond_timedwait_relative_np() is deprecated, and is only
available in the 32-bit ABI (see bionic/libc/include/pthread.h). It is
still used by the 32-bit version of reference-ril. Thanks to a recent
bugfix for 64-bit [1], it is now safe to replace the deprecated
function with the standard pthread_cond_timedwait(). Doing so also
simplifies the code, as there is now a unified logic for 32 and 64-bit
targets.
[1] https://android-review.googlesource.com/210301
Signed-off-by: Yu Ning <yu.ning@intel.com>
(cherry picked from commit
3480b1832d3581c708868117c0eb21ba291df165)
Change-Id: I1a15ee0fdfea38b6ee9c9fd49845d10d45f485b1
Jinhui Li [Thu, 24 Mar 2016 00:55:10 +0000 (08:55 +0800)]
reference-ril/atchannel.c: Fix time conversion
setTimespecRelative() converts a relative time to an absolute time, by
adding the relative time to current system time. However, it fails to
handle the case where the nanosecond component (tv_nsec) of the
conversion result exceeds 10^9, which can cause a subsequent call to
pthread_cond_timedwait() to return EINVAL.
This bug is the root cause of the "no SIM card" error seen occasionally
on x86_64 Android emulator. In fact, all 64-bit targets use
setTimespecRelative() in conjunction with pthread_cond_timedwait()
during AT handshake, but an EINVAL return value from the latter will
lead to an infinite loop and hang the communication. With this fix,
x86_64 emulator can boot with functional 3G networking every time.
Signed-off-by: Jinhui Li <jinhui.li@intel.com>
[Revised code and commit message]
Signed-off-by: Yu Ning <yu.ning@intel.com>
(cherry picked from commit
11476211584f1a82c870b9486ace8f6f8bb9fc7c)
Change-Id: I5d7396ef7f0af5ef02ccab785046d635fb8f168c
Yu Ning [Fri, 1 Apr 2016 15:37:50 +0000 (15:37 +0000)]
Merge "reference-ril: Stop using pthread_cond_timedwait_relative_np()" am:
2e481da
am:
e3546c6
* commit '
e3546c6cb66f2d100de5d0a249f53a783d2d5222':
reference-ril: Stop using pthread_cond_timedwait_relative_np()
Change-Id: I27b6544423c1ee9fe98c18df452b035f37049b76
Yu Ning [Fri, 1 Apr 2016 15:33:26 +0000 (15:33 +0000)]
Merge "reference-ril: Stop using pthread_cond_timedwait_relative_np()"
am:
2e481da
* commit '
2e481dac44a85fbd2e812cd4b7ca06a5a090a6ed':
reference-ril: Stop using pthread_cond_timedwait_relative_np()
Change-Id: I0c0c35c7839719ec37099d08f0979bb3fef8ed63
Elliott Hughes [Fri, 1 Apr 2016 15:28:42 +0000 (15:28 +0000)]
Merge "reference-ril: Stop using pthread_cond_timedwait_relative_np()"
Sanket Padawe [Fri, 1 Apr 2016 00:52:30 +0000 (00:52 +0000)]
Add documentation for RIL_SAP_INIT in ril.h
am:
1be49ba
* commit '
1be49ba51de8b4c81132003d12b269f5d0237132':
Add documentation for RIL_SAP_INIT in ril.h
Change-Id: Ib48fb227e88901c4bac17891d0f09fc459f3ceb2
Sanket Padawe [Fri, 1 Apr 2016 00:37:23 +0000 (17:37 -0700)]
Add documentation for RIL_SAP_INIT in ril.h
Bug:
27726715
Change-Id: I3c48820f689052a89986191ccb08754197eea229
Yu Ning [Thu, 31 Mar 2016 13:49:59 +0000 (21:49 +0800)]
reference-ril: Stop using pthread_cond_timedwait_relative_np()
pthread_cond_timedwait_relative_np() is deprecated, and is only
available in the 32-bit ABI (see bionic/libc/include/pthread.h). It is
still used by the 32-bit version of reference-ril. Thanks to a recent
bugfix for 64-bit [1], it is now safe to replace the deprecated
function with the standard pthread_cond_timedwait(). Doing so also
simplifies the code, as there is now a unified logic for 32 and 64-bit
targets.
[1] https://android-review.googlesource.com/210301
Change-Id: I0895bbf65ddb71965018d6945dfb8baa786d5d89
Signed-off-by: Yu Ning <yu.ning@intel.com>
Jinhui Li [Wed, 30 Mar 2016 05:53:31 +0000 (05:53 +0000)]
Merge "reference-ril/atchannel.c: Fix time conversion" am:
0bbaed7
am:
230df4a
* commit '
230df4ab9c69358026634079c1dece849b10d2f0':
reference-ril/atchannel.c: Fix time conversion
Change-Id: I02f358e240858166c4360b368b23c0dfdee67ff1
Jinhui Li [Wed, 30 Mar 2016 05:49:48 +0000 (05:49 +0000)]
Merge "reference-ril/atchannel.c: Fix time conversion"
am:
0bbaed7
* commit '
0bbaed79d7054d6c3f085e910e6047dafa11b1ad':
reference-ril/atchannel.c: Fix time conversion
Change-Id: Ibc7df71b27dc1f8d458cdfc1d3b3b10c57f017a4
Bo Hu [Wed, 30 Mar 2016 05:46:57 +0000 (05:46 +0000)]
Merge "reference-ril/atchannel.c: Fix time conversion"
Jinhui Li [Thu, 24 Mar 2016 00:55:10 +0000 (08:55 +0800)]
reference-ril/atchannel.c: Fix time conversion
setTimespecRelative() converts a relative time to an absolute time, by
adding the relative time to current system time. However, it fails to
handle the case where the nanosecond component (tv_nsec) of the
conversion result exceeds 10^9, which can cause a subsequent call to
pthread_cond_timedwait() to return EINVAL.
This bug is the root cause of the "no SIM card" error seen occasionally
on x86_64 Android emulator. In fact, all 64-bit targets use
setTimespecRelative() in conjunction with pthread_cond_timedwait()
during AT handshake, but an EINVAL return value from the latter will
lead to an infinite loop and hang the communication. With this fix,
x86_64 emulator can boot with functional 3G networking every time.
Signed-off-by: Jinhui Li <jinhui.li@intel.com>
[Revised code and commit message]
Signed-off-by: Yu Ning <yu.ning@intel.com>
Change-Id: If04ba560e350bc4e13b22c51f8d215a673230667
Ajay Nambi [Mon, 21 Mar 2016 17:08:09 +0000 (17:08 +0000)]
Ril Error codes: Voice related messages
am:
1034589
* commit '
1034589c37aa83c97f1dcb660209bc6dccb6160a':
Ril Error codes: Voice related messages
Ajay Nambi [Sat, 19 Mar 2016 16:02:28 +0000 (09:02 -0700)]
Ril Error codes: Voice related messages
This change adds new error codes for messages
related to voice
Bug:
27038563
Change-Id: I61bcc853f8046e6baf6c8000029f7af0f3f894f0
Ajay Nambi [Mon, 14 Mar 2016 21:11:19 +0000 (21:11 +0000)]
New error codes for SMS/other messages
am:
68900f5a8e
* commit '
68900f5a8eda71d962961ccab56ed3fc99cfd124':
New error codes for SMS/other messages
Ajay Nambi [Fri, 11 Mar 2016 20:02:55 +0000 (12:02 -0800)]
New error codes for SMS/other messages
This gerrit adds error codes for messages related
to SMS and set_mute, get_mute requests
Bug:
27038563
Change-Id: I4991e4a38c81501c39e91cfd5df90d8288f542ad
twen.chang [Fri, 11 Mar 2016 17:40:54 +0000 (17:40 +0000)]
Merge "Add RIL Error code list" into mm-wireless-dev
am:
8dc7f4d003
* commit '
8dc7f4d00303f74cbca2d784eaa32e103555f0b5':
Add RIL Error code list
Sanket Padawe [Fri, 11 Mar 2016 17:31:55 +0000 (17:31 +0000)]
Merge "Add RIL Error code list" into mm-wireless-dev
twen.chang [Fri, 4 Mar 2016 10:27:48 +0000 (18:27 +0800)]
Add RIL Error code list
BUG:
27589497
Change-Id: I9cc8c12364676c3c56dbee57fdc01cf055460816
Sanket Padawe [Thu, 10 Mar 2016 01:51:57 +0000 (17:51 -0800)]
Fix memory leak in atchannel.c
Bug:
27134985
Change-Id: I0273a40f175212bed4aad42e46feb333d9df9a2b
Sanket Padawe [Tue, 8 Mar 2016 17:44:16 +0000 (17:44 +0000)]
Enable integer sanitization in libril.
am:
2f0b452b4a
* commit '
2f0b452b4a234199dcce17dc370aebb126c661c9':
Enable integer sanitization in libril.
Sanket Padawe [Tue, 8 Mar 2016 02:09:55 +0000 (18:09 -0800)]
Enable integer sanitization in libril.
Bug:
27486276
Change-Id: I5d440099120567f1ecedb898039b5627346c7089