OSDN Git Service
yinxu [Wed, 3 May 2017 22:15:19 +0000 (15:15 -0700)]
Define new network scan RIL API
This CL defines the RIL API for network scan and also includes dummy
stubs for the new API.
Test: Telephony Sanity Test
Bug:
30954762
Merged-in: Id276ca35d399c6860dc5f6413991ddf0ab3fd5e5
Change-Id: Id276ca35d399c6860dc5f6413991ddf0ab3fd5e5
(cherry picked from commit
3abe7c7b5ce788c112c5893734a5e0372a07991e)
(cherry picked from commit
584379e4cbfbfbaffd1a7be6d20ae6c685c925c5)
Grace Chen [Tue, 16 May 2017 19:57:03 +0000 (19:57 +0000)]
Merge "Support different SIM power states" am:
df82df8ff4 am:
0770994e46
am:
eb0c18c9e0
Change-Id: Iab3b109cfb8973428b00b915fe062085f8522b11
Grace Chen [Tue, 16 May 2017 19:50:55 +0000 (19:50 +0000)]
Merge "Support different SIM power states" am:
df82df8ff4
am:
0770994e46
Change-Id: I8a4c315f18dfc5fd918e503f49d6d6b0ecb655d2
Grace Chen [Tue, 16 May 2017 19:42:50 +0000 (19:42 +0000)]
Merge "Support different SIM power states"
am:
df82df8ff4
Change-Id: I62e054cfc05a0e74fb42655389e40b1c0d02812b
Grace Chen [Tue, 16 May 2017 19:30:25 +0000 (19:30 +0000)]
Merge "Support different SIM power states"
Grace Chen [Fri, 24 Mar 2017 01:39:48 +0000 (18:39 -0700)]
Support different SIM power states
Test: Verify SIM power states
Bug:
35844036
Merged-In: Iabdbcba2572a481537c47da536b66a4b99365511
Change-Id: Iabdbcba2572a481537c47da536b66a4b99365511
Naveen Kalla [Fri, 12 May 2017 22:46:03 +0000 (22:46 +0000)]
Merge "Add RIL_UNSOL_MODEM_RESTART message" am:
e6e95633a9 am:
45cba67df3
am:
bcb71f3324 -s ours
Change-Id: Iecd49e6762e8e35731b6b15afc4ac334f8ab63f8
Naveen Kalla [Fri, 12 May 2017 22:39:07 +0000 (22:39 +0000)]
Merge "Add RIL_UNSOL_MODEM_RESTART message" am:
e6e95633a9
am:
45cba67df3
Change-Id: I68bfbc4b31534573f66f5ccace53332c67f89fd1
Naveen Kalla [Fri, 12 May 2017 22:31:43 +0000 (22:31 +0000)]
Merge "Add RIL_UNSOL_MODEM_RESTART message"
am:
e6e95633a9
Change-Id: I082cb6ccf49038da6891f7293083b7af0f5e078d
Treehugger Robot [Fri, 12 May 2017 22:25:25 +0000 (22:25 +0000)]
Merge "Add RIL_UNSOL_MODEM_RESTART message"
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.
Test: Manual
Merged-In: I21310be011ec9df395cc1fc95c6c96dbfba86792
Change-Id: I21310be011ec9df395cc1fc95c6c96dbfba86792
Naina Nalluri [Thu, 11 May 2017 00:56:06 +0000 (00:56 +0000)]
Update ril.h documentation
am:
6772858ab5
Change-Id: I2fd6d8c1a04e90d5d782b4db474ebd4ee661aefd
Naina Nalluri [Fri, 5 May 2017 00:40:04 +0000 (17:40 -0700)]
Update ril.h documentation
update ril.h documentation with
nas/data error codes
Bug:
35671595
Test: Only Doc update
Change-Id: I966db0db7051b6c76544ed9dae6edd10e5a3c5a0
Jayachandran Chinnakkannu [Mon, 1 May 2017 20:37:08 +0000 (20:37 +0000)]
Merge "Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG" into oc-dev
am:
350bc81a8e
Change-Id: I3bb49f8e0e86843141e437352558a09e17e54f43
Jayachandran Chinnakkannu [Mon, 1 May 2017 20:32:02 +0000 (20:32 +0000)]
Merge "Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG" into oc-dev
Jayachandran C [Mon, 1 May 2017 19:19:12 +0000 (19:19 +0000)]
Do not treat NULL response as error for getAllowedCarriers
am:
4709430fbe
Change-Id: Iede7269e0aa02f76f5aac7579c745045899c890a
Jayachandran C [Fri, 28 Apr 2017 07:57:13 +0000 (00:57 -0700)]
Do not treat NULL response as error for getAllowedCarriers
NULL is a valid response in RIL_REQUEST_GET_CARRIER_RESTRICTIONS
as per RIL.h. NULL implies all carriers are allowed. This fix skips
setting error if response is NULL to fix VTS failure.
Test: VTS
Bug:
37849113
Bug:
37157801
Change-Id: Ida3d2d0f10693ed396b236ac9512afb277ce2ddb
Jayachandran C [Sun, 30 Apr 2017 17:21:14 +0000 (10:21 -0700)]
Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG
Test: VTS
Bug:
37849113
Bug:
37157801
Change-Id: I6e2f384751973457775ab8c084189bddd59d0dd3
Jayachandran Chinnakkannu [Mon, 1 May 2017 16:42:55 +0000 (16:42 +0000)]
Merge "Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG" am:
cea6432601 am:
41fb22dcb4
am:
1eb054537d
Change-Id: I979a311b8590095f24934b5ff2381cc6900bab6b
Jayachandran Chinnakkannu [Mon, 1 May 2017 16:40:55 +0000 (16:40 +0000)]
Merge "Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG" am:
cea6432601
am:
41fb22dcb4
Change-Id: If18665bef8b157bfb58d3380ce4ddef7d36b723b
Jayachandran Chinnakkannu [Mon, 1 May 2017 16:38:25 +0000 (16:38 +0000)]
Merge "Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG"
am:
cea6432601
Change-Id: I2ce1574fc0fa12db61441c0f245183e9b09b2bae
Jayachandran Chinnakkannu [Mon, 1 May 2017 16:33:28 +0000 (16:33 +0000)]
Merge "Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG"
Jayachandran C [Sun, 30 Apr 2017 17:21:14 +0000 (10:21 -0700)]
Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG
Test: VTS
Bug:
37157801
Change-Id: I6e2f384751973457775ab8c084189bddd59d0dd3
Meng Wang [Fri, 28 Apr 2017 22:43:38 +0000 (22:43 +0000)]
Merge "Do not treat NULL response as error for getAllowedCarriers" am:
e1bdb3ff16 am:
2579380c88
am:
cbfb65f7cc
Change-Id: Ic1fe6f3c559b26f26f3aa9335a04836be969abff
Meng Wang [Fri, 28 Apr 2017 22:37:38 +0000 (22:37 +0000)]
Merge "Do not treat NULL response as error for getAllowedCarriers" am:
e1bdb3ff16
am:
2579380c88
Change-Id: I90ec89ab5fb4d781e05cfcdfc4293b993333fcf3
Meng Wang [Fri, 28 Apr 2017 22:30:53 +0000 (22:30 +0000)]
Merge "Do not treat NULL response as error for getAllowedCarriers"
am:
e1bdb3ff16
Change-Id: If32eef2b16e89b4a3a6c308588597e8f415ad2db
Meng Wang [Fri, 28 Apr 2017 22:25:51 +0000 (22:25 +0000)]
Merge "Do not treat NULL response as error for getAllowedCarriers"
Jayachandran C [Fri, 28 Apr 2017 07:57:13 +0000 (00:57 -0700)]
Do not treat NULL response as error for getAllowedCarriers
NULL is a valid response in RIL_REQUEST_GET_CARRIER_RESTRICTIONS
as per RIL.h. NULL implies all carriers are allowed. This fix skips
setting error if response is NULL to fix VTS failure.
Test: VTS
Bug:
37157801
Change-Id: Ida3d2d0f10693ed396b236ac9512afb277ce2ddb
pkanwar [Thu, 27 Apr 2017 20:15:56 +0000 (13:15 -0700)]
resolve merge conflicts of
ee186e9 to oc-dev-plus-aosp
Change-Id: I6f4b2606cc2f4e985a33f629e7861121b32a9952
Test: manual
Bug:
35606429
Pankaj Kanwar [Thu, 27 Apr 2017 17:58:55 +0000 (17:58 +0000)]
Merge "Radio Interface changes to allow the modem to query the framework for the key." am:
71460d3e6a
am:
5e428e83a1
Change-Id: I66a58266858ae9211ec7b03f6df3f8d5b3bdd017
Pankaj Kanwar [Thu, 27 Apr 2017 17:49:49 +0000 (17:49 +0000)]
Merge "Radio Interface changes to allow the modem to query the framework for the key."
am:
71460d3e6a
Change-Id: I51277fc92b964ac8e0c0df62d186af674a0cf0e9
Pankaj Kanwar [Thu, 27 Apr 2017 17:41:56 +0000 (17:41 +0000)]
Merge "Radio Interface changes to allow the modem to query the framework for the key."
pkanwar [Fri, 17 Mar 2017 19:49:34 +0000 (12:49 -0700)]
Radio Interface changes to allow the modem to query the framework
for the key.
This CL adds the 1.1 version of the HAL interface. It also introduces
support for 2 new messags:
1. setCarrierInfoForImsiEncryption
2. carrierInfoForImsiEncryption
BUG:
35606429
Test: manual
Change-Id: Iad02a20081e8bd1b8daaac396d20d888f8567252
Merged-In: I1d953914c23f8a1d94cc85e023ead3fd3c036ec5
sqian [Mon, 24 Apr 2017 22:46:08 +0000 (22:46 +0000)]
Remove GENERIC_FAILURE still in ril.h
am:
2e093616e8
Change-Id: Ia6c9a8836b2c4d87fb576840fdb45bac2653ad9d
sqian [Mon, 24 Apr 2017 18:48:06 +0000 (11:48 -0700)]
Remove GENERIC_FAILURE still in ril.h
Bug:
36385785
Test: No change to behavior
Change-Id: I1757219bb758b3af694395fbba229cde74614f00
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: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: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: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: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: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 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 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
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
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: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: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: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: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 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: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: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"