OSDN Git Service

android-x86/hardware-ril.git
7 years agoMerge "Fixed compilation error when MEMSET_FREED is turned on" am: 27d62c6e87 am...
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

7 years agoMerge "Fixed compilation error when MEMSET_FREED is turned on" am: 27d62c6e87 am...
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

7 years agoMerge "Fixed compilation error when MEMSET_FREED is turned on" am: 27d62c6e87
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

7 years agoMerge "Fixed compilation error when MEMSET_FREED is turned on"
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

7 years agoMerge "Fixed compilation error when MEMSET_FREED is turned on"
Treehugger Robot [Fri, 14 Apr 2017 22:39:24 +0000 (22:39 +0000)]
Merge "Fixed compilation error when MEMSET_FREED is turned on"

7 years agoFixed incorrect parameter handling for setup data call am: 8b48914dc3
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

7 years agoFixed incorrect parameter handling for setup data call
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

7 years agoFixed compilation error when MEMSET_FREED is turned on
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

7 years agoMerge "Fixed incorrect parameter handling for setup data call" am: a6c7475cfa am...
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

7 years agoFixed 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
Merged-In: I1a4e0ef93ba8a1b63519d59b18f55af195ddbea2
Change-Id: I1a4e0ef93ba8a1b63519d59b18f55af195ddbea2

7 years agoMerge "Fixed incorrect parameter handling for setup data call" am: a6c7475cfa am...
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

7 years agoMerge "Fixed incorrect parameter handling for setup data call" am: a6c7475cfa
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

7 years agoMerge "Fixed incorrect parameter handling for setup data call"
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

7 years agoMerge "Fixed incorrect parameter handling for setup data call"
Treehugger Robot [Fri, 14 Apr 2017 18:12:47 +0000 (18:12 +0000)]
Merge "Fixed incorrect parameter handling for setup data call"

7 years agoFixed 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

7 years agoMerge "Move libril to the vendor partition." into oc-dev am: 82c7999a32
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

7 years agoMerge "Move libril to the vendor partition." into oc-dev
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

7 years agoMerge "Move libril to the vendor partition." into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 04:33:47 +0000 (04:33 +0000)]
Merge "Move libril to the vendor partition." into oc-dev

7 years agoMove libril to the vendor partition.
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

7 years agoMerge "Fix warnings and set Werror flags to not let them happen again."
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."

7 years agoMerge "Add p2 option in openLogicalChannel" into oc-dev am: bb49259223
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

7 years agoMerge "Add p2 option in openLogicalChannel" into oc-dev
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

7 years agoMerge "Add p2 option in openLogicalChannel" into oc-dev
Amit Mahajan [Wed, 12 Apr 2017 22:02:34 +0000 (22:02 +0000)]
Merge "Add p2 option in openLogicalChannel" into oc-dev

7 years agoFix warnings and set Werror flags to not let them happen again.
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

7 years agoAdd 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

Test: Basic telephony sanity
Bug: 27360148
Change-Id: I9679178e2a6f0decd48f30e358685106b91163b8

7 years agoMerge "Add p2 option in openLogicalChannel" am: f3f567d540 am: 2792b81933 am: aed35999a1
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

7 years agoMerge "Add p2 option in openLogicalChannel" am: f3f567d540 am: 2792b81933
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

7 years agoMerge "Add p2 option in openLogicalChannel" am: f3f567d540
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

7 years agoMerge "Add p2 option in openLogicalChannel"
Amit Mahajan [Tue, 11 Apr 2017 21:35:01 +0000 (21:35 +0000)]
Merge "Add p2 option in openLogicalChannel"
am: f3f567d540

Change-Id: I7061c4427f35f127d8420d179b7c2be46e0446bd

7 years agoMerge "Add p2 option in openLogicalChannel"
Amit Mahajan [Tue, 11 Apr 2017 21:25:41 +0000 (21:25 +0000)]
Merge "Add p2 option in openLogicalChannel"

7 years agoAdd 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

7 years agoRemove obsolete target. am: 6ed4cab8d3
Steven Moreland [Mon, 10 Apr 2017 19:59:47 +0000 (19:59 +0000)]
Remove obsolete target. am: 6ed4cab8d3
am: 61f508c5ae

Change-Id: I47c5ca693ccd18de6bfa15c37df518b3d28cc100

7 years agoRemove obsolete target.
Steven Moreland [Mon, 10 Apr 2017 19:51:31 +0000 (19:51 +0000)]
Remove obsolete target.
am: 6ed4cab8d3

Change-Id: I8502e2dcc495d3040b7eedd42dd333aea1a19668

7 years agoRemove obsolete target.
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

7 years agoMerge "Use explicit .c_str() for hidl_string" am: 74d2a33ad5 am: c1348d3483 am: a0b10...
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

7 years agoMerge "Use explicit .c_str() for hidl_string" into oc-dev am: 457428f6dd
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

7 years agoMerge "Use explicit .c_str() for hidl_string" am: 74d2a33ad5 am: c1348d3483
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

7 years agoMerge "Use explicit .c_str() for hidl_string" am: 74d2a33ad5
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

7 years agoMerge "Use explicit .c_str() for hidl_string"
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

7 years agoMerge "Use explicit .c_str() for hidl_string"
Treehugger Robot [Thu, 6 Apr 2017 19:47:44 +0000 (19:47 +0000)]
Merge "Use explicit .c_str() for hidl_string"

7 years agoMerge "Use explicit .c_str() for hidl_string" into oc-dev
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

7 years agoMerge "Use explicit .c_str() for hidl_string" into oc-dev
Scott Randolph [Thu, 6 Apr 2017 18:01:41 +0000 (18:01 +0000)]
Merge "Use explicit .c_str() for hidl_string" into oc-dev

7 years agoMerge "rild.c: Use log/log.h instead of utils/Log.h" into oc-dev am: 494dd2187e
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

7 years agoMerge "rild.c: Use log/log.h instead of utils/Log.h" 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

7 years agoMerge "rild.c: Use log/log.h instead of utils/Log.h" into oc-dev
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

7 years agoUse explicit .c_str() for hidl_string
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)

7 years agoChange radio related service names to slot1, slot2, slot3... am: 35e9310a95
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

7 years agoChange radio related service names to slot1, slot2, slot3...
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

7 years agorild.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

7 years agoChange 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

7 years agoresolve merge conflicts of 77eb76c to oc-dev-plus-aosp
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

7 years agoresolve merge conflicts of 77eb76c to oc-dev-plus-aosp
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

7 years agoMerge "Change radio related service names to slot1, slot2, slot3..." am: 25f66a9aa9
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

7 years agoMerge "Change radio related service names to slot1, slot2, slot3..."
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

7 years agoMerge "Change radio related service names to slot1, slot2, slot3..."
Treehugger Robot [Tue, 4 Apr 2017 22:01:37 +0000 (22:01 +0000)]
Merge "Change radio related service names to slot1, slot2, slot3..."

7 years agoChange 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

7 years agoMerge "rild.c: Use log/log.h instead of utils/Log.h" am: 210d7d9059 am: 35a9183f59...
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

7 years agoMerge "rild.c: Use log/log.h instead of utils/Log.h" am: 210d7d9059 am: 35a9183f59
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

7 years agoMerge "rild.c: Use log/log.h instead of utils/Log.h" am: 210d7d9059
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

7 years agoMerge "rild.c: Use log/log.h instead of utils/Log.h"
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

7 years agoMerge "rild.c: Use log/log.h instead of utils/Log.h"
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"

7 years agorild.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

7 years agoUse explicit .c_str() for hidl_string
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

7 years agoAllow newer message format indicating signal strength
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

7 years agoMerge "Change radio related service names to slot1, slot2, slot3..."
Amit Mahajan [Fri, 31 Mar 2017 17:40:03 +0000 (17:40 +0000)]
Merge "Change radio related service names to slot1, slot2, slot3..."

7 years agoChange 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

7 years agoRevert "Revert "Emulator: adjust reference-ril to the refactored qemu_pipe""
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

7 years agoSapImpl: log error description am: c7aaac2316 -s ours
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

7 years agoSapImpl: log error description
Steven Moreland [Wed, 29 Mar 2017 06:22:39 +0000 (06:22 +0000)]
SapImpl: log error description
am: c7aaac2316  -s ours

Change-Id: I7c7dcd675bc3111776da856c1ba07825a9a2d1a9

7 years agoMerge "SapImpl: log error description" am: b3e6a478ff am: 8d0438cb9c am: 9a184aad03
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

7 years agoMerge "SapImpl: log error description" am: b3e6a478ff am: 8d0438cb9c
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

7 years agoMerge "SapImpl: log error description" am: b3e6a478ff
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

7 years agoMerge "SapImpl: log error description"
Steven Moreland [Wed, 29 Mar 2017 02:15:24 +0000 (02:15 +0000)]
Merge "SapImpl: log error description"
am: b3e6a478ff

Change-Id: Ibd4c8aa2c39e4c55e666392fc7d2bf98927cd461

7 years agoMerge "SapImpl: log error description"
Treehugger Robot [Wed, 29 Mar 2017 02:10:07 +0000 (02:10 +0000)]
Merge "SapImpl: log error description"

7 years agoSapImpl: 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

7 years agoSapImpl: log error description
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

7 years agoRevert "Emulator: adjust reference-ril to the refactored qemu_pipe"
bohu [Tue, 28 Mar 2017 21:53:04 +0000 (14:53 -0700)]
Revert "Emulator: adjust reference-ril to the refactored qemu_pipe"

This reverts commit 4799b529349e229cba4c2d5fe48454a8b3d32d09.

This change is being reverted because it broke the git_master build
for full-eng and other targets.

7 years agoMerge "Emulator: adjust reference-ril to the refactored qemu_pipe"
Bo Hu [Tue, 28 Mar 2017 18:13:53 +0000 (18:13 +0000)]
Merge "Emulator: adjust reference-ril to the refactored qemu_pipe"

7 years agoMerge "Remove SAP socket." am: 3ca9bd02b8 am: 8de5ac7bae
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

7 years agoMerge "Remove SAP socket." am: 3ca9bd02b8
Amit Mahajan [Tue, 28 Mar 2017 05:14:00 +0000 (05:14 +0000)]
Merge "Remove SAP socket." am: 3ca9bd02b8
am: 8de5ac7bae

Change-Id: I574d84aeba4c22fd58a84704da2f55c5307cf5e4

7 years agoMerge "Remove SAP socket."
Amit Mahajan [Tue, 28 Mar 2017 05:06:12 +0000 (05:06 +0000)]
Merge "Remove SAP socket."
am: 3ca9bd02b8

Change-Id: I602d5f3506c716445371dfa19ac6aa20c16f2386

7 years agoMerge "Remove SAP socket."
Amit Mahajan [Tue, 28 Mar 2017 04:56:37 +0000 (04:56 +0000)]
Merge "Remove SAP socket."

7 years agoRemove 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

7 years agoRemove SAP socket.
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

7 years agoMerge "Move RILC logs under verbose flag to reduce the RILC log spam" am: 13bbab0ddb...
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

7 years agoMerge "Move RILC logs under verbose flag to reduce the RILC log spam" am: 13bbab0ddb
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

7 years agoMerge "Move RILC logs under verbose flag to reduce the RILC log spam"
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

7 years agoMerge "Move RILC logs under verbose flag to reduce the RILC log spam"
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"

7 years agoMove 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

7 years agoMerge "Removing GENERIC_FAILURE from API documentation in ril.h" am: 6ea410309a am...
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

7 years agoMerge "Removing GENERIC_FAILURE from API documentation in ril.h" am: 6ea410309a
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

7 years agoMerge "Removing GENERIC_FAILURE from API documentation in ril.h"
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

7 years agoMerge "Removing GENERIC_FAILURE from API documentation in ril.h"
Shuo Qian [Fri, 24 Mar 2017 17:21:17 +0000 (17:21 +0000)]
Merge "Removing GENERIC_FAILURE from API documentation in ril.h"

7 years agoRemoving 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

7 years agoMerge "Remove rild sockets." am: 7c22062ff6 am: 7662321cbf
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

7 years agoMerge "Remove rild sockets." am: 7c22062ff6
Amit Mahajan [Wed, 22 Mar 2017 17:00:18 +0000 (17:00 +0000)]
Merge "Remove rild sockets." am: 7c22062ff6
am: 7662321cbf

Change-Id: I023a53e5d1aa535683bc409a1f99b972c5f7db74

7 years agoMerge "Remove rild sockets."
Amit Mahajan [Wed, 22 Mar 2017 16:58:39 +0000 (16:58 +0000)]
Merge "Remove rild sockets."
am: 7c22062ff6

Change-Id: I5d2833330cb606f6379d2af42806c97a8632312a

7 years agoMerge "Remove rild sockets."
Amit Mahajan [Wed, 22 Mar 2017 16:54:40 +0000 (16:54 +0000)]
Merge "Remove rild sockets."

7 years agoRemove 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

7 years agoRemove rild sockets.
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