OSDN Git Service
Sanket Padawe [Tue, 1 Nov 2016 22:54:56 +0000 (22:54 +0000)]
Merge "Fix broken asserts." am:
b3897e1170 am:
7d866fb63d am:
9f33775e35
am:
2b445a4d21
Change-Id: I9a27bebe2ad24c5d29a6d88a4e5b548ee21fa4fc
Sanket Padawe [Tue, 1 Nov 2016 22:52:17 +0000 (22:52 +0000)]
Merge "Fix broken asserts." am:
b3897e1170 am:
7d866fb63d
am:
9f33775e35
Change-Id: I4b71dc54fa956e889edb7e8d7b852b9c66d21b1d
Sanket Padawe [Tue, 1 Nov 2016 22:49:44 +0000 (22:49 +0000)]
Merge "Fix broken asserts." am:
b3897e1170
am:
7d866fb63d
Change-Id: Id7202829aeddec32bb965891dcbeb9d27084bb44
Sanket Padawe [Tue, 1 Nov 2016 22:47:19 +0000 (22:47 +0000)]
Merge "Fix broken asserts."
am:
b3897e1170
Change-Id: Ifb8e93f704b582f1c4ae7e90ae4e4cfb5a130bfe
Sanket Padawe [Tue, 1 Nov 2016 22:43:41 +0000 (22:43 +0000)]
Merge "Fix broken asserts."
George Burgess IV [Fri, 28 Oct 2016 05:51:30 +0000 (22:51 -0700)]
Fix broken asserts.
When NDEBUG is forcibly undef'ed, these asserts wouldn't compile:
- p_info->fdCommand and p_info->fdListen are ints, not pointers.
- sapSocket->commandFd and sapSocket->listenFd are protected; you need
to use their accessors.
This patch makes the asserts compile.
Bug: None.
Test: Building with NDEBUG undef'ed now succeeds.
Change-Id: I51418c955994541ba503e1ca6f601dce87e40b55
Elliott Hughes [Thu, 13 Oct 2016 23:14:42 +0000 (23:14 +0000)]
Merge "Retire socket_loopback_client." am:
ecc7336e5c am:
14f6f0c59c am:
c056e49a99
am:
87e2f3e918
Change-Id: Iafc545ca74cd6b9175ea06e6723c6bcefc4c566f
Elliott Hughes [Thu, 13 Oct 2016 23:10:26 +0000 (23:10 +0000)]
Merge "Retire socket_loopback_client." am:
ecc7336e5c am:
14f6f0c59c
am:
c056e49a99
Change-Id: I862d1d234394ba6e5ef76993cb4a39454f76b478
Elliott Hughes [Thu, 13 Oct 2016 23:06:43 +0000 (23:06 +0000)]
Merge "Retire socket_loopback_client." am:
ecc7336e5c
am:
14f6f0c59c
Change-Id: Ib3c6af1d582cb7a8c37a4803abb1a048bbeaf51c
Elliott Hughes [Thu, 13 Oct 2016 23:04:13 +0000 (23:04 +0000)]
Merge "Retire socket_loopback_client."
am:
ecc7336e5c
Change-Id: I0c5abf53913be7dc16e6e38bc1f498e64664a489
Treehugger Robot [Thu, 13 Oct 2016 22:59:25 +0000 (22:59 +0000)]
Merge "Retire socket_loopback_client."
Pankaj Kanwar [Thu, 13 Oct 2016 02:41:20 +0000 (02:41 +0000)]
Merge "Update documentation to clarify RIL_REQUEST_GET_ACTIVITY_INFO" am:
49794a48cb am:
762c60c85a am:
b5a0cce85b
am:
0caf283b1c
Change-Id: Ia2ef8d71b37a7b27165da49379ec390ed169687b
Pankaj Kanwar [Thu, 13 Oct 2016 02:35:28 +0000 (02:35 +0000)]
Merge "Update documentation to clarify RIL_REQUEST_GET_ACTIVITY_INFO" am:
49794a48cb am:
762c60c85a
am:
b5a0cce85b
Change-Id: I33a92b0df1b95bcbbc2de6437fd0c6754ef012d0
Pankaj Kanwar [Thu, 13 Oct 2016 02:28:27 +0000 (02:28 +0000)]
Merge "Update documentation to clarify RIL_REQUEST_GET_ACTIVITY_INFO" am:
49794a48cb
am:
762c60c85a
Change-Id: I50d3b93af310f781ee522cf44c19a1eee0249893
Nathan Harold [Thu, 13 Oct 2016 02:21:55 +0000 (02:21 +0000)]
Update documentation to clarify RIL_REQUEST_GET_ACTIVITY_INFO am:
c863521147 am:
500e1720eb
am:
89adba6d4a
Change-Id: Ia993c4b099604928cc177c2cee8337399e63e60e
Pankaj Kanwar [Thu, 13 Oct 2016 02:21:20 +0000 (02:21 +0000)]
Merge "Update documentation to clarify RIL_REQUEST_GET_ACTIVITY_INFO"
am:
49794a48cb
Change-Id: I5e050678502d7b83c1a6870c5be33baabbfa4c4d
Nathan Harold [Thu, 13 Oct 2016 02:14:48 +0000 (02:14 +0000)]
Update documentation to clarify RIL_REQUEST_GET_ACTIVITY_INFO am:
c863521147
am:
500e1720eb
Change-Id: I87501c890b709dbaca71e941a1c751e9345db4f3
Pankaj Kanwar [Thu, 13 Oct 2016 02:13:30 +0000 (02:13 +0000)]
Merge "Update documentation to clarify RIL_REQUEST_GET_ACTIVITY_INFO"
Nathan Harold [Thu, 13 Oct 2016 02:07:47 +0000 (02:07 +0000)]
Update documentation to clarify RIL_REQUEST_GET_ACTIVITY_INFO
am:
c863521147
Change-Id: I01b10273285311173766966878d8174cda8e6bf8
Nathan Harold [Mon, 10 Oct 2016 18:15:21 +0000 (11:15 -0700)]
Update documentation to clarify RIL_REQUEST_GET_ACTIVITY_INFO
The documentation for RIL_REQUEST_GET_ACTIVITY_INFO allowed for
critically disruptive behavior in the implementation of the API.
This is a documentation update to ensure that there will be
exactly one power state reported in each millisecond, which
is important for proper power accounting in FDD.
Bug:
32061813
Test: none
Change-Id: I2835d5ad298eaa8cfea2e1a90342f290183f698d
Elliott Hughes [Tue, 11 Oct 2016 20:50:06 +0000 (13:50 -0700)]
Retire socket_loopback_client.
Making the world safe for IPv6.
Bug: http://b/
31537253
Test: builds
Change-Id: If8478aec17892f49e856d6220b72e4585ee9c078
Nathan Harold [Mon, 10 Oct 2016 18:15:21 +0000 (11:15 -0700)]
Update documentation to clarify RIL_REQUEST_GET_ACTIVITY_INFO
The documentation for RIL_REQUEST_GET_ACTIVITY_INFO allowed for
critically disruptive behavior in the implementation of the API.
This is a documentation update to ensure that there will be
exactly one power state reported in each millisecond, which
is important for proper power accounting in FDD.
Bug:
32061813
Test: none
Change-Id: I2835d5ad298eaa8cfea2e1a90342f290183f698d
Naveen Kalla [Wed, 14 Sep 2016 20:41:04 +0000 (13:41 -0700)]
Add RIL_UNSOL_MODEM_RESTART message
RIL_UNSOL_MODEM_RESTART will be sent by vendor RILs when it detects
a modem restart along with the reason for restart which could be a
crash signature if the modem restarted due to a crash or a some
other string such as a user-initiated restart or AT command
initiated restart.
Change-Id: I21310be011ec9df395cc1fc95c6c96dbfba86792
Sooraj Sasindran [Fri, 23 Sep 2016 18:20:39 +0000 (11:20 -0700)]
Handle invalid length in UUSInfo
Handle invalid length in UUSInfo in DIAL request.
Test: verified for regression
BUG=
28966612
Change-Id: I6437914a0dae1296e898b948ba22565bff7bae57
Sanket Padawe [Fri, 23 Sep 2016 17:49:59 +0000 (17:49 +0000)]
Merge "Fix memory leak in requestSendSMS" am:
07b1732d84 am:
3fbcb63219 am:
2ea3dd7197
am:
a9a25549dd
Change-Id: Icf3801cfa0a37dca0e9f27fec4c744a3981fc154
Sanket Padawe [Fri, 23 Sep 2016 17:32:54 +0000 (17:32 +0000)]
Merge "Fix memory leak in requestSendSMS" am:
07b1732d84 am:
3fbcb63219
am:
2ea3dd7197
Change-Id: Ief8d067872534de91c81248594d83386497b3f02
Sanket Padawe [Fri, 23 Sep 2016 17:31:24 +0000 (17:31 +0000)]
Merge "Fix memory leak in requestSendSMS" am:
07b1732d84
am:
3fbcb63219
Change-Id: I791f6ec0ebcf85563559e5ad900c4ce512d03044
Sanket Padawe [Fri, 23 Sep 2016 17:28:56 +0000 (17:28 +0000)]
Merge "Fix memory leak in requestSendSMS"
am:
07b1732d84
Change-Id: I2f5fe58627d8e5a83fd54b9cb967ba7b39d13376
Sanket Padawe [Fri, 23 Sep 2016 17:26:03 +0000 (17:26 +0000)]
Merge "Fix memory leak in requestSendSMS"
Jonathan Basseri [Mon, 29 Aug 2016 23:15:57 +0000 (16:15 -0700)]
Fix comment typo in ril.h.
Voice registration denied reason code 98 has the description of reason
code 101, but their descriptions are slightly different. This matches
TS 24.008, section 10.5.3.6.
Change-Id: I5de4ac0d8ac1ecb9e19c576adb137ded3c4f8268
Sanket Padawe [Thu, 1 Sep 2016 07:18:38 +0000 (07:18 +0000)]
Merge "Fix RIL_CardStatus_v5 Parceling." am:
164a2c7ff1 am:
c5d7058a68 am:
4ffea6f651
am:
4e20cdfb5f
Change-Id: I9b223a5b57250e4a63d996c1a5c29fef0416e5f7
Sanket Padawe [Thu, 1 Sep 2016 03:43:12 +0000 (03:43 +0000)]
Merge "Fix RIL_CardStatus_v5 Parceling." am:
164a2c7ff1 am:
c5d7058a68
am:
4ffea6f651
Change-Id: Ied193468bd9133d7b9ed710af82c33b9fc3b7e01
Sanket Padawe [Thu, 1 Sep 2016 03:20:14 +0000 (03:20 +0000)]
Merge "Fix RIL_CardStatus_v5 Parceling." am:
164a2c7ff1
am:
c5d7058a68
Change-Id: I00c834069a9b2be0629495bad6580984c8d0273d
Sanket Padawe [Thu, 1 Sep 2016 03:17:45 +0000 (03:17 +0000)]
Merge "Fix RIL_CardStatus_v5 Parceling."
am:
164a2c7ff1
Change-Id: I27e70a5a97deb11ad3dea1bd49c0ac092c291950
Sanket Padawe [Thu, 1 Sep 2016 02:57:56 +0000 (02:57 +0000)]
Merge "Fix RIL_CardStatus_v5 Parceling."
Kyle Repinski [Wed, 31 Aug 2016 06:04:02 +0000 (01:04 -0500)]
Fix RIL_CardStatus_v5 Parceling.
The difference between a v5 and v6 CardStatus response is the addition
of ims_subscription_app_index. In previous releases libril added a -1
to the Parcel in its place for transparent handling of GET_SIM_STATUS
everywhere else regardless of v5 or v6 responses, but it was erroneously
removed in change I4e53c6125995064b8ac0cdfc9376ef2cefe69ec8
Change-Id: I078b61d2f6dc28f738e8eb87f51193fa0bd94c7d
Amit Mahajan [Wed, 17 Aug 2016 19:25:21 +0000 (19:25 +0000)]
Replace variable-length arrays on stack with malloc. am:
943905bb9f am:
837c8b680a am:
bf678da1fe am:
30be8a250b am:
9df4b4f002 am:
3731ea7548 am:
22b41817f8
am:
7cc27a94d9
Change-Id: I77ae4148f0e97bb9624af1b8d73aff28b2788dd8
Amit Mahajan [Wed, 17 Aug 2016 19:25:20 +0000 (19:25 +0000)]
Replace variable-length arrays on stack with malloc. am:
49db26c574 am:
914650eb02
am:
98f00d3803
Change-Id: Ide1533c5472b3e6c9e729ea3bd435cdd57d772b7
Amit Mahajan [Wed, 17 Aug 2016 19:03:27 +0000 (19:03 +0000)]
Replace variable-length arrays on stack with malloc. am:
943905bb9f am:
837c8b680a am:
bf678da1fe am:
30be8a250b am:
9df4b4f002 am:
3731ea7548
am:
22b41817f8
Change-Id: Icec9b66c251619dd47a4302af058d3e76f019b09
Amit Mahajan [Wed, 17 Aug 2016 19:03:26 +0000 (19:03 +0000)]
Replace variable-length arrays on stack with malloc. am:
49db26c574
am:
914650eb02
Change-Id: I9b6439bc29d52871081ef836c1104e80644eb76b
Amit Mahajan [Wed, 17 Aug 2016 18:09:56 +0000 (18:09 +0000)]
Replace variable-length arrays on stack with malloc. am:
943905bb9f am:
837c8b680a am:
bf678da1fe am:
30be8a250b am:
9df4b4f002
am:
3731ea7548
Change-Id: I2979e5bcf5e46ead97bb0fa589431ad9e6f75618
Amit Mahajan [Wed, 17 Aug 2016 18:09:54 +0000 (18:09 +0000)]
Replace variable-length arrays on stack with malloc.
am:
49db26c574
Change-Id: I1932691bfdba50fd4d9ba77505d03866ff312372
Amit Mahajan [Tue, 16 Aug 2016 23:19:42 +0000 (23:19 +0000)]
Replace variable-length arrays on stack with malloc. am:
943905bb9f am:
837c8b680a am:
bf678da1fe am:
30be8a250b am:
9df4b4f002 am:
3f56be6062
am:
0c52fd6db6
Change-Id: I0c843d763f4cd06794c0087e7e614109b77b11b2
Amit Mahajan [Tue, 16 Aug 2016 23:17:13 +0000 (23:17 +0000)]
Replace variable-length arrays on stack with malloc. am:
943905bb9f am:
837c8b680a am:
bf678da1fe am:
30be8a250b am:
9df4b4f002
am:
3f56be6062
Change-Id: I9d2d4f4fb1039fe505c9c2e76b9a57a8801242c3
Amit Mahajan [Tue, 16 Aug 2016 23:17:12 +0000 (23:17 +0000)]
Replace variable-length arrays on stack with malloc. am:
943905bb9f am:
837c8b680a am:
bf678da1fe am:
30be8a250b
am:
9df4b4f002
Change-Id: I42abe5d593acd1014b42a8f97273f706009b16d2
Amit Mahajan [Tue, 16 Aug 2016 23:14:44 +0000 (23:14 +0000)]
Replace variable-length arrays on stack with malloc. am:
943905bb9f am:
837c8b680a am:
bf678da1fe am:
30be8a250b
am:
9df4b4f002
Change-Id: I8e586e654727e3f87f1efc28edf5572b3f971e10
Amit Mahajan [Tue, 16 Aug 2016 23:12:41 +0000 (23:12 +0000)]
Replace variable-length arrays on stack with malloc. am:
943905bb9f am:
837c8b680a am:
bf678da1fe
am:
30be8a250b
Change-Id: I5cc0b7e45e5584d2938cf61da8526039911d374a
Amit Mahajan [Tue, 16 Aug 2016 23:08:11 +0000 (23:08 +0000)]
Replace variable-length arrays on stack with malloc. am:
943905bb9f am:
837c8b680a
am:
bf678da1fe
Change-Id: I3a574c790342b609ca86286140d4d6c7ed12e1aa
Amit Mahajan [Tue, 16 Aug 2016 23:04:13 +0000 (23:04 +0000)]
Replace variable-length arrays on stack with malloc. am:
943905bb9f
am:
837c8b680a
Change-Id: Idfd58f5e20c81a5b67d9f581d932c1a3e3cd1fad
Amit Mahajan [Tue, 16 Aug 2016 23:01:39 +0000 (23:01 +0000)]
Replace variable-length arrays on stack with malloc.
am:
943905bb9f
Change-Id: Ie54e7e1a0e255e61b0c5182ec72b0cdb376efbd1
Amit Mahajan [Mon, 15 Aug 2016 16:06:34 +0000 (09:06 -0700)]
Replace variable-length arrays on stack with malloc.
Bug:
30202619
Change-Id: Ib95e08a1c009d88a4b4fd8d8fdba0641c6129008
Amit Mahajan [Mon, 15 Aug 2016 16:06:34 +0000 (09:06 -0700)]
Replace variable-length arrays on stack with malloc.
Bug:
30202619
Change-Id: Ib95e08a1c009d88a4b4fd8d8fdba0641c6129008
Sanket Padawe [Tue, 9 Aug 2016 00:58:13 +0000 (00:58 +0000)]
Fix documentation of RIL_Request in ril.h am:
05c2307a82 am:
aee7a26ae5
am:
7160204490
Change-Id: I8633c9c79518e7c879085c89101898e33b1e7195
Sanket Padawe [Tue, 9 Aug 2016 00:53:01 +0000 (00:53 +0000)]
Fix documentation of RIL_Request in ril.h am:
05c2307a82
am:
aee7a26ae5
Change-Id: Id8b2b55a292346df3bd719cf3515c3028a9505cd
Sanket Padawe [Tue, 9 Aug 2016 00:45:10 +0000 (00:45 +0000)]
Fix documentation of RIL_Request in ril.h
am:
05c2307a82
Change-Id: I6f8f6ca3d2d0f023602110ad3840784d8caee42a
Sanket Padawe [Mon, 8 Aug 2016 22:42:17 +0000 (15:42 -0700)]
Fix documentation of RIL_Request in ril.h
Bug:
30380273
Change-Id: If086f5ea6f986a0da0d6f0729c28d913103b01ed
Meng Wang [Fri, 22 Jul 2016 20:55:31 +0000 (20:55 +0000)]
Add comment for RIL_REQUEST_SET_CARRIER_RESTRICTIONS and RIL_REQUEST_GET_CARRIER_RESTRICTIONS am:
d5c540fe09
am:
d9280860da
Change-Id: If7c72e60488b747e4d1e3bf10f940cc00caddd9c
Meng Wang [Fri, 22 Jul 2016 20:44:08 +0000 (20:44 +0000)]
Add comment for RIL_REQUEST_SET_CARRIER_RESTRICTIONS and RIL_REQUEST_GET_CARRIER_RESTRICTIONS
am:
d5c540fe09
Change-Id: Ifad313a7f5f1926091fd9f042eb8302c8a5bd595
Meng Wang [Fri, 15 Jul 2016 22:41:19 +0000 (15:41 -0700)]
Add comment for RIL_REQUEST_SET_CARRIER_RESTRICTIONS and RIL_REQUEST_GET_CARRIER_RESTRICTIONS
Added modem behavior convention for vendor's reference
Bug:
29409395
Change-Id: Ic7bbf24ca8d62e14353ad4d7ea8f1e5fabaf96f9
Sanket Padawe [Fri, 8 Jul 2016 23:59:03 +0000 (23:59 +0000)]
Fix build warnings in ril.cpp. am:
65879e8093
am:
1f113677ed
Change-Id: Id43af86c1e88d3126ecf24337793781aa3b28fe0
Sanket Padawe [Fri, 8 Jul 2016 23:36:16 +0000 (23:36 +0000)]
Fix build warnings in ril.cpp.
am:
65879e8093
Change-Id: I929558165ff54c09fad8fbfe2b4fea1fc721c100
Sanket Padawe [Fri, 8 Jul 2016 21:51:03 +0000 (14:51 -0700)]
Fix build warnings in ril.cpp.
Bug:
29401612
Change-Id: Icba225928f1336785cc5cb9a81e1c5b7b2121353
TreeHugger Robot [Fri, 8 Jul 2016 16:58:24 +0000 (16:58 +0000)]
Merge "rild: Destroy the minijail struct after dropping privs."
Jorge Lucangeli Obes [Thu, 7 Jul 2016 20:23:22 +0000 (16:23 -0400)]
rild: Destroy the minijail struct after dropping privs.
This fixes a small memory leak.
Bug:
28178548
Change-Id: Ib97ba3c6a4ee0cd6bed19abef386c1dd3071f518
Sanket Padawe [Fri, 1 Jul 2016 00:43:39 +0000 (00:43 +0000)]
Merge commit \'
f0c8ca7f09ed9a827e5c79e019526e8f2c77eeb4\' into manual_merge_f0c8ca7
am:
40be36d427
Change-Id: I5b191e1e741a0649a7ba84b15c8ccceda762b5d4
Sanket Padawe [Fri, 1 Jul 2016 00:08:41 +0000 (17:08 -0700)]
Merge commit '
f0c8ca7f09ed9a827e5c79e019526e8f2c77eeb4' into manual_merge_f0c8ca7
Change-Id: I670c9270d5d6fccd4b1a223de142d61e26541b7e
Sanket Padawe [Thu, 30 Jun 2016 22:01:08 +0000 (15:01 -0700)]
Fix build warnings in hardware/ril.
Bug:
29401612
Change-Id: I8473294655ad24ec001cedb84856004ab0ba22a7
Chih-Hung Hsieh [Wed, 29 Jun 2016 19:52:43 +0000 (19:52 +0000)]
Merge \\\\"Fix misc-macro-parentheses warnings in hardware/ril.\\\\" am:
1648a3f50b am:
929b0a7e35 am:
d335e16728
am:
b1d959a986
Change-Id: I7ec84994c501e6a74fc88c18603ed0d16ab63899
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:14:36 +0000 (21:14 +0000)]
Merge \\"Fix compile warning in libril.cpp\\" into nyc-mr1-dev am:
4ada88aeb5
am:
089400c5ad
Change-Id: Ic99dda93c2573e232c88af22bb60be87bd58ee30
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 19:23:09 +0000 (19:23 +0000)]
Add support for LTE CarrierAgregation am:
6dbb43ca9a
am:
95d59e56a6
Change-Id: I7007fa0632415d7d395c73f833c7aafad7826116
Ajay Nambi [Thu, 23 Jun 2016 18:53:10 +0000 (18:53 +0000)]
Add support for LTE CarrierAgregation
am:
6dbb43ca9a
Change-Id: I1f4ffab284b6952b2f196e5ecec74cb6b27a7b1b
David Turner [Thu, 23 Jun 2016 09:51:02 +0000 (09:51 +0000)]
resolve merge conflicts of
d027477 to nyc-mr1-dev-plus-aosp
am:
5d6ef97672
Change-Id: Id8844f27c56acd111a975d7a74153b5289281bb8
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 Turner [Tue, 21 Jun 2016 08:13:08 +0000 (08:13 +0000)]
Merge \\\\"[qemu]: Use new <system/qemu_pipe.h> header.\\\\" am:
47a81105da am:
c963b671f3 am:
12db6c3cf4
am:
8cd152faee
Change-Id: I1bdf3012d376da36683cd79bd52729fc1cd6e281
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:22:16 +0000 (00:22 +0000)]
Merge \\"Move struct def out of an #ifdef\\" into nyc-mr1-dev am:
a976a8221f
am:
0d68af6870
Change-Id: I34df28e2d5ae4ddacf2c8b4f8996d6c2fea7cfa1
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 23:05:03 +0000 (23:05 +0000)]
Fix responseCarrierRestrictions string wrting to parcel am:
b460ba8ecc
am:
bf3df8729c
Change-Id: I9519546528b1e036bef09d85788707b870f0bde6
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:26:27 +0000 (22:26 +0000)]
Merge \\"Fix dispatchCarrierRestrictions string reading from parcel\\" into nyc-mr1-dev am:
6d445bb4a1
am:
afb885c546
Change-Id: I457ed9d6deb69c498df4efbe6f8d65589909dc73
OSDN Git Service
