OSDN Git Service
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"
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
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: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
Amit Mahajan [Tue, 28 Mar 2017 05:22:24 +0000 (05:22 +0000)]
Merge "Remove SAP socket." am:
3ca9bd02b8 am:
8de5ac7bae
am:
94521c910a -s ours
Change-Id: Idd5018862f6fbc1d19aee464692dd653dc92f10f
Amit Mahajan [Tue, 28 Mar 2017 05:14:00 +0000 (05:14 +0000)]
Merge "Remove SAP socket." am:
3ca9bd02b8
am:
8de5ac7bae
Change-Id: I574d84aeba4c22fd58a84704da2f55c5307cf5e4
Amit Mahajan [Tue, 28 Mar 2017 05:06:12 +0000 (05:06 +0000)]
Merge "Remove SAP socket."
am:
3ca9bd02b8
Change-Id: I602d5f3506c716445371dfa19ac6aa20c16f2386
Amit Mahajan [Tue, 28 Mar 2017 04:56:37 +0000 (04:56 +0000)]
Merge "Remove SAP socket."
Amit Mahajan [Wed, 22 Mar 2017 18:25:51 +0000 (11:25 -0700)]
Remove SAP socket.
Test: Basic SAP sanity
Bug:
32020264
Merged-in: Iece9d047db513e425e8a954e2ece2bba7e3e2535
Change-Id: Iece9d047db513e425e8a954e2ece2bba7e3e2535
Amit Mahajan [Wed, 22 Mar 2017 18:25:51 +0000 (11:25 -0700)]
Remove SAP socket.
Test: Basic SAP sanity
Bug:
32020264
Change-Id: Iece9d047db513e425e8a954e2ece2bba7e3e2535
Jayachandran Chinnakkannu [Sun, 26 Mar 2017 02:40:46 +0000 (02:40 +0000)]
Merge "Move RILC logs under verbose flag to reduce the RILC log spam" am:
13bbab0ddb am:
66f6695c0b
am:
5005c1be3a
Change-Id: I5fc323b460adc4dc3ce98fa6905679223a1490e9
Jayachandran Chinnakkannu [Sun, 26 Mar 2017 02:38:15 +0000 (02:38 +0000)]
Merge "Move RILC logs under verbose flag to reduce the RILC log spam" am:
13bbab0ddb
am:
66f6695c0b
Change-Id: I86f8faf313d4ad2da78825ed3e4395d4a70c5885
Jayachandran Chinnakkannu [Sun, 26 Mar 2017 02:35:46 +0000 (02:35 +0000)]
Merge "Move RILC logs under verbose flag to reduce the RILC log spam"
am:
13bbab0ddb
Change-Id: I9630182957c8c4f4932573c936aca029919b5eb8
Jayachandran Chinnakkannu [Sun, 26 Mar 2017 02:32:18 +0000 (02:32 +0000)]
Merge "Move RILC logs under verbose flag to reduce the RILC log spam"
Jayachandran C [Sat, 25 Mar 2017 21:30:13 +0000 (14:30 -0700)]
Move RILC logs under verbose flag to reduce the RILC log spam
This change moves most of RLOGD prints under VDGB flag
Test: Verified that the RILC log spam is reduced
Bug:
36613198
Change-Id: Ife7042b523a445605b297ed244d0f884d0b39179
Shuo Qian [Fri, 24 Mar 2017 17:30:29 +0000 (17:30 +0000)]
Merge "Removing GENERIC_FAILURE from API documentation in ril.h" am:
6ea410309a am:
d00910aad5
am:
3d696d8e42
Change-Id: Idcbb37672a64e933a2f78c7fc34c5f93f1eeab74
Shuo Qian [Fri, 24 Mar 2017 17:27:56 +0000 (17:27 +0000)]
Merge "Removing GENERIC_FAILURE from API documentation in ril.h" am:
6ea410309a
am:
d00910aad5
Change-Id: Ic9729c06688b50f73be99a27d701cff3f25d8e47
Shuo Qian [Fri, 24 Mar 2017 17:26:28 +0000 (17:26 +0000)]
Merge "Removing GENERIC_FAILURE from API documentation in ril.h"
am:
6ea410309a
Change-Id: I695aaa62900d55ad23b271860aa672fd9a3d0a6a
Shuo Qian [Fri, 24 Mar 2017 17:21:17 +0000 (17:21 +0000)]
Merge "Removing GENERIC_FAILURE from API documentation in ril.h"
Shuoq [Mon, 20 Mar 2017 23:31:23 +0000 (16:31 -0700)]
Removing GENERIC_FAILURE from API documentation in ril.h
GENERIC_FAILURE should not be returned in any case.
Bug:
36385785
Test: No change to behavior
Change-Id: I5d3da76aadf9f2643d1e2ca5ca1d8f741e7a25c5
Amit Mahajan [Wed, 22 Mar 2017 17:03:11 +0000 (17:03 +0000)]
Merge "Remove rild sockets." am:
7c22062ff6 am:
7662321cbf
am:
82b7efe9e2 -s ours
Change-Id: I2c50eda23201bada91e89b1cf196ed19e62beae4
Amit Mahajan [Wed, 22 Mar 2017 17:00:18 +0000 (17:00 +0000)]
Merge "Remove rild sockets." am:
7c22062ff6
am:
7662321cbf
Change-Id: I023a53e5d1aa535683bc409a1f99b972c5f7db74
Amit Mahajan [Wed, 22 Mar 2017 16:58:39 +0000 (16:58 +0000)]
Merge "Remove rild sockets."
am:
7c22062ff6
Change-Id: I5d2833330cb606f6379d2af42806c97a8632312a
Amit Mahajan [Wed, 22 Mar 2017 16:54:40 +0000 (16:54 +0000)]
Merge "Remove rild sockets."
Amit Mahajan [Tue, 14 Mar 2017 23:39:27 +0000 (16:39 -0700)]
Remove rild sockets.
Test: Basic telephony sanity
Bug:
32020264
Merged-in: Icff46cadab085ca7882ed32ee0c6f9247a028817
Change-Id: Icff46cadab085ca7882ed32ee0c6f9247a028817
Amit Mahajan [Tue, 14 Mar 2017 23:39:27 +0000 (16:39 -0700)]
Remove rild sockets.
Test: Basic telephony sanity
Bug:
32020264
Change-Id: Icff46cadab085ca7882ed32ee0c6f9247a028817
Naveen Kalla [Mon, 20 Mar 2017 04:39:20 +0000 (04:39 +0000)]
Merge "Convert empty response to -1 for some SIM APIs" am:
7e18f92330 am:
2c7bc41c4c
am:
6fc12e7833
Change-Id: I3dcf8ed7d7c68645986c61cafb8c92707708f6d2
Naveen Kalla [Mon, 20 Mar 2017 04:34:05 +0000 (04:34 +0000)]
Merge "Convert empty response to -1 for some SIM APIs" am:
7e18f92330
am:
2c7bc41c4c
Change-Id: I1ce70a847c0b3afd0728db95bcc917927188fb1a
Naveen Kalla [Mon, 20 Mar 2017 04:31:04 +0000 (04:31 +0000)]
Merge "Convert empty response to -1 for some SIM APIs"
am:
7e18f92330
Change-Id: Id483483cce600cafa1c392e2027abd9ba140c863
Naveen Kalla [Mon, 20 Mar 2017 04:24:45 +0000 (04:24 +0000)]
Merge "Convert empty response to -1 for some SIM APIs"
Naveen Kalla [Thu, 16 Mar 2017 19:55:55 +0000 (12:55 -0700)]
Convert empty response to -1 for some SIM APIs
Earlier RILs did not send a response for some cases although the
interface expected an integer as response. Do not return error if
response is empty. Instead Return -1 in those cases to maintain backward
compatibility.
Bug:
36209518
Test: Enable fixed dialing number and call barring by dialing *35*PASSWORD#.
Check logs to make sure RILC does not fail with invalid response
on devices where RIL doesn't send a response to these requests
on success.
Change-Id: I1d91bacd60bd19985710a111de57e86f03e6ce4a
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:41:44 +0000 (22:41 +0000)]
Merge "Add new precise call fail causes and OEM causes" am:
8f1c83e068 am:
f1c740adec
am:
166d45018d
Change-Id: Icd5f5acf344f6a97f5e9ec79e1b5ec0ff0a8a696
OSDN Git Service
