OSDN Git Service
Steven Moreland [Thu, 20 Apr 2017 15:54:57 +0000 (15:54 +0000)]
Merge changes from topic 'system-vendor-internal-pick' am:
0ce4693d8f am:
d92a0e60d2 am:
b4b6846c61
am:
c9c675b5f1
Change-Id: I789ba7b09abae510e6045ab5d654b8830227381e
Steven Moreland [Thu, 20 Apr 2017 15:54:52 +0000 (15:54 +0000)]
Move libril to the vendor partition. am:
f9185eebbb am:
8c6e560755 am:
0862947d3f
am:
7f2808964c
Change-Id: I2c8a0ef652d6ab921ec05ca3b9f29f200d60f5ad
Steven Moreland [Thu, 20 Apr 2017 04:21:37 +0000 (04:21 +0000)]
Merge changes from topic 'system-vendor-internal-pick' am:
0ce4693d8f am:
d92a0e60d2
am:
b4b6846c61
Change-Id: I82788a246e3427137942367a8597b1fbd8922764
Steven Moreland [Thu, 20 Apr 2017 04:21:33 +0000 (04:21 +0000)]
Move libril to the vendor partition. am:
f9185eebbb am:
8c6e560755
am:
0862947d3f
Change-Id: I05a573e6103c8508a55b5b4cee17bc67298e150f
Steven Moreland [Thu, 20 Apr 2017 01:59:27 +0000 (01:59 +0000)]
Merge changes from topic 'system-vendor-internal-pick' am:
0ce4693d8f
am:
d92a0e60d2
Change-Id: I0c96476ca98301f839ec0b2cf7a84e00b24985e2
Steven Moreland [Thu, 20 Apr 2017 01:59:24 +0000 (01:59 +0000)]
Move libril to the vendor partition. am:
f9185eebbb
am:
8c6e560755
Change-Id: Ic52897cc2252fad71bd9fdd7e818906bc358f1a0
Steven Moreland [Thu, 20 Apr 2017 01:48:20 +0000 (01:48 +0000)]
Merge changes from topic 'system-vendor-internal-pick'
am:
0ce4693d8f
Change-Id: Id0e53b2ab17df9adc81ceca8d75c798797c9d96c
Steven Moreland [Thu, 20 Apr 2017 01:48:11 +0000 (01:48 +0000)]
Move libril to the vendor partition.
am:
f9185eebbb
Change-Id: I66dae7bf4d5d05e91e7fcb1cc7dc0fda44f3910f
Treehugger Robot [Thu, 20 Apr 2017 01:39:21 +0000 (01:39 +0000)]
Merge changes from topic 'system-vendor-internal-pick'
* changes:
libril: include what you use
Move libril to the vendor partition.
Steven Moreland [Mon, 17 Apr 2017 23:36:32 +0000 (16:36 -0700)]
libril: include what you use
Unused binder header removal.
Test: works with BOARD_VNDK_VERSION := current
Bug:
33241851
(cherry picked from commit
3eab89a5c5f6f6436cac39ef713fbd2474f61cb1)
Merged-In: I26f0bdb63ac98264bb11d5f7c68d68cf427988ec
Change-Id: I26f0bdb63ac98264bb11d5f7c68d68cf427988ec
Steven Moreland [Fri, 7 Apr 2017 20:39:55 +0000 (13:39 -0700)]
Move libril to the vendor partition.
This module should not be built on the system partition.
Test: old libril instances removed from out by CleanSpec.mk
Test: phone call on internal marlin
Bug:
33241851
(cherry picked from commit
8265b407a32f61569b47e4514dd3f07561785fad)
Merged-In: I27cbe60831c838a5d6fb75a5a9c32af0554fc5bb
Change-Id: I27cbe60831c838a5d6fb75a5a9c32af0554fc5bb
Steven Moreland [Tue, 18 Apr 2017 02:59:37 +0000 (02:59 +0000)]
Merge "libril: include what you use" into oc-dev am:
7a019683de
am:
e674543758
Change-Id: Id0cda2a84040362d068c78edb57c492fbf85f8d9
Steven Moreland [Tue, 18 Apr 2017 02:06:43 +0000 (02:06 +0000)]
Merge "libril: include what you use" into oc-dev
am:
7a019683de
Change-Id: I05c6a6c5592bc7bd0a64ea998927fc1a83776ec6
TreeHugger Robot [Tue, 18 Apr 2017 01:56:53 +0000 (01:56 +0000)]
Merge "libril: include what you use" into oc-dev
Steven Moreland [Mon, 17 Apr 2017 23:36:32 +0000 (16:36 -0700)]
libril: include what you use
Unused binder header removal.
Test: works with BOARD_VNDK_VERSION := current
Bug:
33241851
Change-Id: I26f0bdb63ac98264bb11d5f7c68d68cf427988ec
Jack Yu [Mon, 17 Apr 2017 18:31:47 +0000 (18:31 +0000)]
Fixed several memory related issues. am:
c22b3de9b6
am:
a8f071006c
Change-Id: Ibd7bbba9e2cb826a574dd08eaf8dab93102e63eb
Jack Yu [Mon, 17 Apr 2017 18:26:55 +0000 (18:26 +0000)]
Fixed several memory related issues.
am:
c22b3de9b6
Change-Id: I34d363aa68d426d786c61f7db2b3b9864514a45a
Jack Yu [Fri, 14 Apr 2017 07:08:06 +0000 (00:08 -0700)]
Fixed several memory related issues.
1. Fixed memory leaks in set initial attach apn error conditions.
2. Used consistent way to initialize structures.
Test: Telephony sanity tests
bug:
37347693
Merged-In: I19fe8dfef718e617d9c60914b6eb74f9b84a6544
Change-Id: I19fe8dfef718e617d9c60914b6eb74f9b84a6544
Jack Yu [Mon, 17 Apr 2017 00:05:37 +0000 (00:05 +0000)]
Merge "Fixed several memory related issues." am:
0318efe4cc am:
98cbc54424 am:
39c6b6757e
am:
d1486717ac
Change-Id: I80a1bf7332cd4c207dae9dd7d8f51d70cc312853
Jack Yu [Mon, 17 Apr 2017 00:01:02 +0000 (00:01 +0000)]
Merge "Fixed several memory related issues." am:
0318efe4cc am:
98cbc54424
am:
39c6b6757e
Change-Id: Iccd6594fe62b7f09a03b7894e00256dc4d0735ca
Jack Yu [Sun, 16 Apr 2017 23:55:56 +0000 (23:55 +0000)]
Merge "Fixed several memory related issues." am:
0318efe4cc
am:
98cbc54424
Change-Id: I5f736311b6d300610ddf96d51bd711fac6bddfd5
Jack Yu [Sun, 16 Apr 2017 23:51:26 +0000 (23:51 +0000)]
Merge "Fixed several memory related issues."
am:
0318efe4cc
Change-Id: Ib45916afe9c2fbe7cb86d4f247c68d14461fe301
Treehugger Robot [Sun, 16 Apr 2017 23:46:20 +0000 (23:46 +0000)]
Merge "Fixed several memory related issues."
Jack Yu [Fri, 14 Apr 2017 22:50:55 +0000 (22:50 +0000)]
Merge "Fixed compilation error when MEMSET_FREED is turned on" am:
27d62c6e87 am:
3070799d05 am:
fc5c7ee4c8
am:
fa85ebe1bc
Change-Id: Iac80c15da0261f06d10687557d1a0408f4536096
Jack Yu [Fri, 14 Apr 2017 22:50:02 +0000 (22:50 +0000)]
Merge "Fixed compilation error when MEMSET_FREED is turned on" am:
27d62c6e87 am:
3070799d05
am:
fc5c7ee4c8
Change-Id: I5a6f26297b1c74f1c2b2d309839da470bc8c5efe
Jack Yu [Fri, 14 Apr 2017 22:46:25 +0000 (22:46 +0000)]
Merge "Fixed compilation error when MEMSET_FREED is turned on" am:
27d62c6e87
am:
3070799d05
Change-Id: I96d4d88f2787cde4a72c605194c1675b1a3c55b9
Jack Yu [Fri, 14 Apr 2017 22:43:55 +0000 (22:43 +0000)]
Merge "Fixed compilation error when MEMSET_FREED is turned on"
am:
27d62c6e87
Change-Id: I836e2aef95982262f1c9cbee004a008262ee38d8
Treehugger Robot [Fri, 14 Apr 2017 22:39:24 +0000 (22:39 +0000)]
Merge "Fixed compilation error when MEMSET_FREED is turned on"
Jack Yu [Fri, 14 Apr 2017 07:08:06 +0000 (00:08 -0700)]
Fixed several memory related issues.
1. Fixed memory leaks in set initial attach apn error conditions.
2. Used consistent way to initialize structures.
Test: Telephony sanity tests
bug:
37347693
Change-Id: I19fe8dfef718e617d9c60914b6eb74f9b84a6544
Jack Yu [Fri, 14 Apr 2017 20:40:57 +0000 (20:40 +0000)]
Fixed incorrect parameter handling for setup data call am:
8b48914dc3
am:
3d42f37057
Change-Id: I054a14e133fc432c1d2740a68c180adc71240406
Jack Yu [Fri, 14 Apr 2017 20:36:31 +0000 (20:36 +0000)]
Fixed incorrect parameter handling for setup data call
am:
8b48914dc3
Change-Id: I62cbdf0a4d35d971f9f8b13aa1841b056da9d1b4
Jack Yu [Fri, 14 Apr 2017 19:51:49 +0000 (12:51 -0700)]
Fixed compilation error when MEMSET_FREED is turned on
Currently MEMSET_FREED is off so no compilation error. But
in case this is on, we need to fix the compilation error.
Test: build
bug:
37347693
Change-Id: I5d95a58f39ee5ff12dabbad457747d3468d70f28
Jack Yu [Fri, 14 Apr 2017 19:06:54 +0000 (19:06 +0000)]
Merge "Fixed incorrect parameter handling for setup data call" am:
a6c7475cfa am:
0d8966fef4 am:
b55081d2ca
am:
e53e1cc3de
Change-Id: I4ebc33159b11744f77f46b26b51ffe0274fe70f4
Jack Yu [Fri, 14 Apr 2017 03:55:03 +0000 (20:55 -0700)]
Fixed incorrect parameter handling for setup data call
Integers were incorrectly passed into dispatchStrings
and treated as string pointers. Also did not correctly
handle MVNO type NONE case.
bug:
36690591
Test: Telephony sanity tests
Merged-In: I1a4e0ef93ba8a1b63519d59b18f55af195ddbea2
Change-Id: I1a4e0ef93ba8a1b63519d59b18f55af195ddbea2
Jack Yu [Fri, 14 Apr 2017 18:24:04 +0000 (18:24 +0000)]
Merge "Fixed incorrect parameter handling for setup data call" am:
a6c7475cfa am:
0d8966fef4
am:
b55081d2ca
Change-Id: Ie79104559c76a859c8b8666ec6e8d458aa17dba0
Jack Yu [Fri, 14 Apr 2017 18:17:03 +0000 (18:17 +0000)]
Merge "Fixed incorrect parameter handling for setup data call" am:
a6c7475cfa
am:
0d8966fef4
Change-Id: I8c2710ae98c79766691db47522c9583da3b1679e
Jack Yu [Fri, 14 Apr 2017 18:15:02 +0000 (18:15 +0000)]
Merge "Fixed incorrect parameter handling for setup data call"
am:
a6c7475cfa
Change-Id: I906fd00cc6b07928cc5d320339f8250f1c9946f9
Treehugger Robot [Fri, 14 Apr 2017 18:12:47 +0000 (18:12 +0000)]
Merge "Fixed incorrect parameter handling for setup data call"
Jack Yu [Fri, 14 Apr 2017 03:55:03 +0000 (20:55 -0700)]
Fixed incorrect parameter handling for setup data call
Integers were incorrectly passed into dispatchStrings
and treated as string pointers. Also did not correctly
handle MVNO type NONE case.
bug:
36690591
Test: Telephony sanity tests
Change-Id: I1a4e0ef93ba8a1b63519d59b18f55af195ddbea2
Steven Moreland [Fri, 14 Apr 2017 05:37:48 +0000 (05:37 +0000)]
Merge "Move libril to the vendor partition." into oc-dev am:
82c7999a32
am:
27cff84997
Change-Id: If718ff6f30188d09c41c20bf8d14bc1ad4381e44
Steven Moreland [Fri, 14 Apr 2017 04:43:56 +0000 (04:43 +0000)]
Merge "Move libril to the vendor partition." into oc-dev
am:
82c7999a32
Change-Id: I48f90718ceaf2cb5b32e9ff3a9bba671d4abb002
TreeHugger Robot [Fri, 14 Apr 2017 04:33:47 +0000 (04:33 +0000)]
Merge "Move libril to the vendor partition." into oc-dev
Steven Moreland [Fri, 7 Apr 2017 20:39:55 +0000 (13:39 -0700)]
Move libril to the vendor partition.
This module should not be built on the system partition.
Test: old libril instances removed from out by CleanSpec.mk
Test: phone call on internal marlin
Bug:
33241851
Change-Id: I27cbe60831c838a5d6fb75a5a9c32af0554fc5bb
Tomasz Wasilczyk [Thu, 13 Apr 2017 14:31:25 +0000 (14:31 +0000)]
Merge "Fix warnings and set Werror flags to not let them happen again."
Amit Mahajan [Wed, 12 Apr 2017 22:32:23 +0000 (22:32 +0000)]
Merge "Add p2 option in openLogicalChannel" into oc-dev am:
bb49259223
am:
619b04af1f
Change-Id: I6c97f56def117095acb2e766c2e41540fbd897a7
Amit Mahajan [Wed, 12 Apr 2017 22:14:02 +0000 (22:14 +0000)]
Merge "Add p2 option in openLogicalChannel" into oc-dev
am:
bb49259223
Change-Id: Ie6377778e3e8c3c3e3945f72b226b4eb41e6b54a
Amit Mahajan [Wed, 12 Apr 2017 22:02:34 +0000 (22:02 +0000)]
Merge "Add p2 option in openLogicalChannel" into oc-dev
Tomasz Wasilczyk [Tue, 11 Apr 2017 16:21:08 +0000 (09:21 -0700)]
Fix warnings and set Werror flags to not let them happen again.
Test: it builds.
Bug: b/
37159108
Change-Id: I3b0d6376d81615774b60e71a6eebf6f38224df88
Wileen Chiu [Mon, 23 Nov 2015 22:25:22 +0000 (14:25 -0800)]
Add p2 option in openLogicalChannel
- Adding support for P2 parameter
- Needed to support OMAPI 3.0 defined
by SIM Alliance
Test: Basic telephony sanity
Bug:
27360148
Change-Id: I9679178e2a6f0decd48f30e358685106b91163b8
Amit Mahajan [Tue, 11 Apr 2017 21:59:19 +0000 (21:59 +0000)]
Merge "Add p2 option in openLogicalChannel" am:
f3f567d540 am:
2792b81933 am:
aed35999a1
am:
6e22c5d1a2
Change-Id: I9e35f57fde5d42ecd8985adfc1617a9a1f5eb11c
Amit Mahajan [Tue, 11 Apr 2017 21:50:32 +0000 (21:50 +0000)]
Merge "Add p2 option in openLogicalChannel" am:
f3f567d540 am:
2792b81933
am:
aed35999a1
Change-Id: I2e295ce0860ed711e605124d9d6c827f5a7db23e
Amit Mahajan [Tue, 11 Apr 2017 21:44:11 +0000 (21:44 +0000)]
Merge "Add p2 option in openLogicalChannel" am:
f3f567d540
am:
2792b81933
Change-Id: I502ef11a9d67297ef220202743c3eedf97bac8a0
Amit Mahajan [Tue, 11 Apr 2017 21:35:01 +0000 (21:35 +0000)]
Merge "Add p2 option in openLogicalChannel"
am:
f3f567d540
Change-Id: I7061c4427f35f127d8420d179b7c2be46e0446bd
Amit Mahajan [Tue, 11 Apr 2017 21:25:41 +0000 (21:25 +0000)]
Merge "Add p2 option in openLogicalChannel"
Wileen Chiu [Mon, 23 Nov 2015 22:25:22 +0000 (14:25 -0800)]
Add p2 option in openLogicalChannel
- Adding support for P2 parameter
- Needed to support OMAPI 3.0 defined
by SIM Alliance
Bug:
27360148
Change-Id: I9679178e2a6f0decd48f30e358685106b91163b8
Steven Moreland [Mon, 10 Apr 2017 19:59:47 +0000 (19:59 +0000)]
Remove obsolete target. am:
6ed4cab8d3
am:
61f508c5ae
Change-Id: I47c5ca693ccd18de6bfa15c37df518b3d28cc100
Steven Moreland [Mon, 10 Apr 2017 19:51:31 +0000 (19:51 +0000)]
Remove obsolete target.
am:
6ed4cab8d3
Change-Id: I8502e2dcc495d3040b7eedd42dd333aea1a19668
Steven Moreland [Fri, 7 Apr 2017 20:28:00 +0000 (13:28 -0700)]
Remove obsolete target.
This target was ifdef'd out and left laying around from the past.
Test: pass
Bug:
33241851
Change-Id: I19f6466836c055fd7555a56a123209dc80f8e704
Scott Randolph [Thu, 6 Apr 2017 20:19:37 +0000 (20:19 +0000)]
Merge "Use explicit .c_str() for hidl_string" am:
74d2a33ad5 am:
c1348d3483 am:
a0b107e78c
am:
d432280ede
Change-Id: I387e6296b9f660a41f706fd0eba5a4253b296fe1
Scott Randolph [Thu, 6 Apr 2017 20:09:59 +0000 (20:09 +0000)]
Merge "Use explicit .c_str() for hidl_string" into oc-dev am:
457428f6dd
am:
f883cc4563
Change-Id: Id9aabc6f3292918a78e3803848d67e04d3b89d62
Scott Randolph [Thu, 6 Apr 2017 20:07:48 +0000 (20:07 +0000)]
Merge "Use explicit .c_str() for hidl_string" am:
74d2a33ad5 am:
c1348d3483
am:
a0b107e78c
Change-Id: Ie07c508b7506c74844f1347b2784260bf74e5e45
Scott Randolph [Thu, 6 Apr 2017 20:03:57 +0000 (20:03 +0000)]
Merge "Use explicit .c_str() for hidl_string" am:
74d2a33ad5
am:
c1348d3483
Change-Id: I0b64dda03cbc1914e43c8e179516b0275f7c4109
Scott Randolph [Thu, 6 Apr 2017 20:00:57 +0000 (20:00 +0000)]
Merge "Use explicit .c_str() for hidl_string"
am:
74d2a33ad5
Change-Id: I69f9686e2004dc1f1d40986cc5e4e79ba5b9bdce
Treehugger Robot [Thu, 6 Apr 2017 19:47:44 +0000 (19:47 +0000)]
Merge "Use explicit .c_str() for hidl_string"
Scott Randolph [Thu, 6 Apr 2017 18:14:10 +0000 (18:14 +0000)]
Merge "Use explicit .c_str() for hidl_string" into oc-dev
am:
457428f6dd
Change-Id: I1e358f52391bfc204092832a273bf33aaf523c59
Scott Randolph [Thu, 6 Apr 2017 18:01:41 +0000 (18:01 +0000)]
Merge "Use explicit .c_str() for hidl_string" into oc-dev
Dan Willemsen [Wed, 5 Apr 2017 22:53:21 +0000 (22:53 +0000)]
Merge "rild.c: Use log/log.h instead of utils/Log.h" into oc-dev am:
494dd2187e
am:
5347d0134a
Change-Id: Iacd504ea7d1cb89bf781d312e32e0438675008fe
Dan Willemsen [Wed, 5 Apr 2017 22:47:32 +0000 (22:47 +0000)]
Merge "rild.c: Use log/log.h instead of utils/Log.h" into oc-dev
am:
494dd2187e
Change-Id: I5646ee063b226bf2d47a4a7cd1e153a66e810c36
TreeHugger Robot [Wed, 5 Apr 2017 22:42:16 +0000 (22:42 +0000)]
Merge "rild.c: Use log/log.h instead of utils/Log.h" into oc-dev
Scott Randolph [Mon, 3 Apr 2017 21:06:40 +0000 (14:06 -0700)]
Use explicit .c_str() for hidl_string
hidl_string no longer will provide an implicit cast to const char* as it
interfers with other expected behaviors of the class. It now emulated
std::string in requiring a call to .c_str() to get the same behavior.
Bug:
36532780
Test: Build the tree
Change-Id: I5d672f4a215f4272b7d5d87772667352cf2fb317
(cherry picked from commit
8a7c3b823805bad874f6a3303e40a1e21dd752da)
Amit Mahajan [Wed, 5 Apr 2017 18:02:17 +0000 (18:02 +0000)]
Change radio related service names to slot1, slot2, slot3... am:
35e9310a95
am:
66cc55cfde -s ours
Change-Id: Ic1012e33f3ad8844f10db82808a7f8cad6ca3c86
Amit Mahajan [Wed, 5 Apr 2017 17:56:00 +0000 (17:56 +0000)]
Change radio related service names to slot1, slot2, slot3...
am:
35e9310a95
Change-Id: Ice26de5d28bbe09f6ed68f63e0d9792b2c51878f
Dan Willemsen [Tue, 4 Apr 2017 04:58:13 +0000 (21:58 -0700)]
rild.c: Use log/log.h instead of utils/Log.h
This doesn't use libutils, so it shouldn't be using the libutils
headers. It doesn't use anything unique to utils/Log.h anyways.
It also shouldn't be using any headers from TARGET_OUT_HEADERS (aka
LOCAL_COPY_HEADERS)
Test: m -j rild
Change-Id: I64ef29cdc17a32e013bccfa799cb9c125386cf50
Amit Mahajan [Tue, 28 Mar 2017 18:17:55 +0000 (11:17 -0700)]
Change radio related service names to slot1, slot2, slot3...
Test: Basic telephony sanity
Bug:
36570718
Merged-in: Ia3c3f7b3e2cedd05bafa2d335f9c04e831da0cf4
Change-Id: Ia3c3f7b3e2cedd05bafa2d335f9c04e831da0cf4
Amit Mahajan [Tue, 4 Apr 2017 22:36:28 +0000 (22:36 +0000)]
resolve merge conflicts of
77eb76c to oc-dev-plus-aosp
am:
dd0b80d0b0 -s ours
Change-Id: Id0c397f4ce8b91782c0e89f6068ebc135d554948
Amit Mahajan [Tue, 4 Apr 2017 22:26:21 +0000 (15:26 -0700)]
resolve merge conflicts of
77eb76c to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic7897aba8a92273bd5939417628963ef2304556f
Amit Mahajan [Tue, 4 Apr 2017 22:10:03 +0000 (22:10 +0000)]
Merge "Change radio related service names to slot1, slot2, slot3..." am:
25f66a9aa9
am:
bb37d407b8
Change-Id: Iec0c53a8b1d2363a531f29079c4d98dcb7ac9f62
Amit Mahajan [Tue, 4 Apr 2017 22:07:33 +0000 (22:07 +0000)]
Merge "Change radio related service names to slot1, slot2, slot3..."
am:
25f66a9aa9
Change-Id: I643d505b3338e977abf6b7a8af07bfe609753d8a
Treehugger Robot [Tue, 4 Apr 2017 22:01:37 +0000 (22:01 +0000)]
Merge "Change radio related service names to slot1, slot2, slot3..."
Amit Mahajan [Tue, 28 Mar 2017 18:17:55 +0000 (11:17 -0700)]
Change radio related service names to slot1, slot2, slot3...
Test: Basic telephony sanity
Bug:
36570718
Merged-in: Ia3c3f7b3e2cedd05bafa2d335f9c04e831da0cf4
Change-Id: Ia3c3f7b3e2cedd05bafa2d335f9c04e831da0cf4
Dan Willemsen [Tue, 4 Apr 2017 16:42:53 +0000 (16:42 +0000)]
Merge "rild.c: Use log/log.h instead of utils/Log.h" am:
210d7d9059 am:
35a9183f59 am:
2ef2ec65b1
am:
0ed5b5f1d5
Change-Id: I0af09f20deffd554cef1948c7bf83e2c10d21f01
Dan Willemsen [Tue, 4 Apr 2017 16:38:19 +0000 (16:38 +0000)]
Merge "rild.c: Use log/log.h instead of utils/Log.h" am:
210d7d9059 am:
35a9183f59
am:
2ef2ec65b1
Change-Id: Ic95e1868489b0564d994d2f927eb017cf288a6a2
Dan Willemsen [Tue, 4 Apr 2017 16:34:19 +0000 (16:34 +0000)]
Merge "rild.c: Use log/log.h instead of utils/Log.h" am:
210d7d9059
am:
35a9183f59
Change-Id: I74f36b5a112fb024efff6897354126fb784bb7d6
Dan Willemsen [Tue, 4 Apr 2017 16:29:48 +0000 (16:29 +0000)]
Merge "rild.c: Use log/log.h instead of utils/Log.h"
am:
210d7d9059
Change-Id: Ie9ae3d51dda35dd29ac2a78b52e432811b111f9f
Dan Willemsen [Tue, 4 Apr 2017 16:24:17 +0000 (16:24 +0000)]
Merge "rild.c: Use log/log.h instead of utils/Log.h"
Dan Willemsen [Tue, 4 Apr 2017 04:58:13 +0000 (21:58 -0700)]
rild.c: Use log/log.h instead of utils/Log.h
This doesn't use libutils, so it shouldn't be using the libutils
headers. It doesn't use anything unique to utils/Log.h anyways.
It also shouldn't be using any headers from TARGET_OUT_HEADERS (aka
LOCAL_COPY_HEADERS)
Test: m -j rild
Change-Id: I64ef29cdc17a32e013bccfa799cb9c125386cf50
Scott Randolph [Mon, 3 Apr 2017 21:06:40 +0000 (14:06 -0700)]
Use explicit .c_str() for hidl_string
hidl_string no longer will provide an implicit cast to const char* as it
interfers with other expected behaviors of the class. It now emulated
std::string in requiring a call to .c_str() to get the same behavior.
Bug:
36532780
Test: Build the tree
Change-Id: I5d672f4a215f4272b7d5d87772667352cf2fb317
Jim Kaye [Mon, 3 Apr 2017 20:43:31 +0000 (13:43 -0700)]
Allow newer message format indicating signal strength
This code expected v6 of the cellular signal strength
message. The framework allows up to v10, which takes
more memory. In fact, the framework requires that it
be given a buffer that is the right size for a v10
message.
This code now uses a buffer that is sized for v10.
It accepts either a v6 or a v10 message.
Bug: b.android.com/316334
Test: Manually verified correct behavior with Emulator.
Change-Id: Iaf8dda0e441393b6fde899fa30bcc90a4413f0ef
Amit Mahajan [Fri, 31 Mar 2017 17:40:03 +0000 (17:40 +0000)]
Merge "Change radio related service names to slot1, slot2, slot3..."
Amit Mahajan [Tue, 28 Mar 2017 18:17:55 +0000 (11:17 -0700)]
Change radio related service names to slot1, slot2, slot3...
Test: Basic telephony sanity
Bug:
36570718
Change-Id: Ia3c3f7b3e2cedd05bafa2d335f9c04e831da0cf4
bohu [Wed, 29 Mar 2017 19:20:46 +0000 (12:20 -0700)]
Revert "Revert "Emulator: adjust reference-ril to the refactored qemu_pipe""
This reverts commit
05bab0b719b75925482ab8631ceefc279ecb8656.
Change-Id: I9064151573cf6fdc6b84f9708b5ae223ef42d318
Steven Moreland [Wed, 29 Mar 2017 06:24:39 +0000 (06:24 +0000)]
SapImpl: log error description am:
c7aaac2316 -s ours
am:
347a99fe02 -s ours
Change-Id: I29d3b94dcaa0f113dd2fa014ca8f3e368578d2e0
Steven Moreland [Wed, 29 Mar 2017 06:22:39 +0000 (06:22 +0000)]
SapImpl: log error description
am:
c7aaac2316 -s ours
Change-Id: I7c7dcd675bc3111776da856c1ba07825a9a2d1a9
Steven Moreland [Wed, 29 Mar 2017 02:22:25 +0000 (02:22 +0000)]
Merge "SapImpl: log error description" am:
b3e6a478ff am:
8d0438cb9c am:
9a184aad03
am:
fd32ae6233
Change-Id: I50bc0870df4fc43c1f869696a2edc4db25d8bd0f
Steven Moreland [Wed, 29 Mar 2017 02:19:54 +0000 (02:19 +0000)]
Merge "SapImpl: log error description" am:
b3e6a478ff am:
8d0438cb9c
am:
9a184aad03
Change-Id: Ie8a59145f82446adfd909dd1e3db5d4b6275bfa8
Steven Moreland [Wed, 29 Mar 2017 02:17:24 +0000 (02:17 +0000)]
Merge "SapImpl: log error description" am:
b3e6a478ff
am:
8d0438cb9c
Change-Id: Ided83b9ace1ed50e500d6d0f05b93b6a7d271653
Steven Moreland [Wed, 29 Mar 2017 02:15:24 +0000 (02:15 +0000)]
Merge "SapImpl: log error description"
am:
b3e6a478ff
Change-Id: Ibd4c8aa2c39e4c55e666392fc7d2bf98927cd461
Treehugger Robot [Wed, 29 Mar 2017 02:10:07 +0000 (02:10 +0000)]
Merge "SapImpl: log error description"
Steven Moreland [Tue, 28 Mar 2017 15:55:58 +0000 (08:55 -0700)]
SapImpl: log error description
Test: pass
Bug:
35937742
Change-Id: I9784a15d8de5dc8a0bff849d5d3ef8c162bcb1a0
Steven Moreland [Tue, 28 Mar 2017 15:55:58 +0000 (08:55 -0700)]
SapImpl: log error description
Test: pass
Bug:
35937742
Merged-In: I9784a15d8de5dc8a0bff849d5d3ef8c162bcb1a0
Change-Id: I9784a15d8de5dc8a0bff849d5d3ef8c162bcb1a0