OSDN Git Service

android-x86/hardware-ril.git
6 years agoAdd scan error to Network Scan result
Sooraj Sasindran [Tue, 8 May 2018 04:20:43 +0000 (21:20 -0700)]
Add scan error to Network Scan result

Add scan error to Network Scan result

Bug: 79377435
Test: Verified that SCAN is always responding fine
Change-Id: If0232826aa14fb35fc7a5324bdc95368c88994f5

6 years agoril: Change rild initial sequence to guarantee non-null function pointer before rild...
terrycrhuang [Fri, 4 May 2018 05:47:06 +0000 (13:47 +0800)]
ril: Change rild initial sequence to guarantee non-null function pointer before rild register its hidl service

Test: Build and local test
Bug: 78886552
Change-Id: I1137cc0f4f09f0304662a2227b84c2b5b228d45d

6 years agoMerge "Add DISABLE_RILD_OEM_HOOK." into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 04:35:16 +0000 (04:35 +0000)]
Merge "Add DISABLE_RILD_OEM_HOOK." into pi-dev

6 years agoAdd DISABLE_RILD_OEM_HOOK.
Steven Moreland [Tue, 20 Mar 2018 18:20:05 +0000 (11:20 -0700)]
Add DISABLE_RILD_OEM_HOOK.

OEM hook is deprecated, so adding a way to disable it to
this radio implementation.

Bug: 75322118
Test: boot device w/ DISABLE_RILD_OEM_HOOK works, lshal
Change-Id: Ie7ade48476d2c330df608e9cc8dab805f84dd81d

6 years agoreference-ril: fix asan error
bohu [Mon, 19 Mar 2018 22:49:39 +0000 (15:49 -0700)]
reference-ril:  fix asan error

BUG: 74981776

Change-Id: I9e321fd6b34fe2a37a5e22668f7070f6da7d9f46

6 years agoRevert "Emulator: add CSIM authentication support"
Bo Hu [Fri, 16 Mar 2018 19:30:21 +0000 (19:30 +0000)]
Revert "Emulator: add CSIM authentication support"

This reverts commit 1a0999f5359912a5f8b43ecb242b6fcb1de6c769.

Reason for revert: regression

Change-Id: Iaccff16f66132418e744531db117c7d6af21a90a
BUG: 75284151

6 years agoEmulator: add CSIM authentication support
bohu [Thu, 4 May 2017 21:24:19 +0000 (14:24 -0700)]
Emulator: add CSIM authentication support

BUG: 72886046
BUG: 37719621
BUG: 70507162

Test: run cts -m CtsCarrierApiTestCases -t
android.carrierapi.cts.CarrierApiTest#testGetIccAuthentication

Change-Id: I4438eab706ba4c0bd360600a1eb7322b186c9e82
Signed-off-by: Roman Kiryanov <rkir@google.com>
6 years agoEmulator: use RIL_CellInfo_v12
bohu [Mon, 1 May 2017 22:35:19 +0000 (15:35 -0700)]
Emulator: use RIL_CellInfo_v12

RIL_CellInfo is deprecated and it fails CTS test

BUG: 72886046
Test: run cts -m CtsTelephonyTestCases  -t
android.telephony.cts.CellInfoTest#testCellInfo

Change-Id: I814322824836c91e9a9ad7807a6edb06f2047245
Signed-off-by: Roman Kiryanov <rkir@google.com>
6 years agoEmulator: use APPTYPE_USIM instead of APPTYPE_SIM
bohu [Mon, 1 May 2017 21:59:00 +0000 (14:59 -0700)]
Emulator: use APPTYPE_USIM instead of APPTYPE_SIM

The USIM is assumed to be available by default now.
(previously SIM is default)

BUG: 72886046
Test: run cts -m CtsTelephonyTestCases  -t
android.telephony.cts.TelephonyManagerTest#testGetForbiddenPlmns

Change-Id: I7161df9eb0317cf2c6978b5b4af2332ce91da8a9
Signed-off-by: Roman Kiryanov <rkir@google.com>
6 years agoEmulator: set correct MEID for non-CDMA phone
bohu [Mon, 1 May 2017 21:38:13 +0000 (14:38 -0700)]
Emulator: set correct MEID for non-CDMA phone

For GSM phone, the MEID should be empty.

BUG: 72886046
Test: un cts -m CtsTelephonyTestCases  -t
android.telephony.cts.TelephonyManagerTest#testGetMeid

Change-Id: Id0cabe87f417fe284b41f5394c755cfbd3bd689c

6 years agoEmulator: support querying device identity
bohu [Mon, 1 May 2017 21:07:22 +0000 (14:07 -0700)]
Emulator: support querying device identity

Current reference-ril only support CDMA type;
Changed it to support Non-CDMS type (such as GSM) as well.

BUG: 72886046
Test: run cts -m CtsTelephonyTestCases  -t
android.telephony.cts.TelephonyManagerTest#testGetImei

Change-Id: I8a5f61d96568b22f990da2004248436fcef7a51a
Signed-off-by: Roman Kiryanov <rkir@google.com>
6 years agoUse system property gateway if not using WiFi
Bjoern Johansson [Thu, 27 Jul 2017 22:41:08 +0000 (15:41 -0700)]
Use system property gateway if not using WiFi

When running with WiFi the IPv4 gateway for the radio interface is known
and can be hardcoded, even if TAP is enabled. This is because the
gateway is the internal address in the router namespace. Without WiFi
the radio interface is eth0, the public interface. The gateway for this
interface can be dynamic if running with TAP networking so in that case
it can't use a hardcoded gateway the way it used to. The DHCP client
will set the net.eth0.gw system property to the gateway of the host
network so use that property to give the correct gateway to the radio
interface.
Bug: 72886046
Test: manual, build and ran the emulator (steps from CTS tests)
Change-Id: I110a1216cccc846a48befe4c8cb2e602ed63752f
(cherry picked from commit cf111309af68ab095371ef495d2c78e1faf885a6)
(cherry picked from commit 0de94de9dc67db550f50bf2ffe3360b7ce02907d)

6 years agoMerge "Enable/disable radio interface on setup/deactivate" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 01:02:28 +0000 (01:02 +0000)]
Merge "Enable/disable radio interface on setup/deactivate" into pi-dev

6 years agoEnable/disable radio interface on setup/deactivate
Bjoern Johansson [Wed, 22 Mar 2017 21:54:00 +0000 (14:54 -0700)]
Enable/disable radio interface on setup/deactivate

When a RIL request to setup or deactivate data calls the radio interface
would previously be left up. This caused some problems for IPv6 when
switching between WiFi and radio. When WiFi was disable the radio
interface would not send a router solicitation and so the IPv6 router
table would not be populated with a default gateway. Disabling and
enabling the interface solves this since enabling the interface triggers
the router solicitation. Additionally this also makes networking
unavailable when radio data is turned off as one might expect.
Bug: 72886046
Test: manual, build and ran the emulator (steps from CTS tests)
Change-Id: I658ebd8ea6e691a6ffb829e38e1ebbec67002645
(cherry picked from commit 9d552844e9936d03cc5a8856040fca18a2d2f5ac)
(cherry picked from commit 857f2d522c5163d8bbcf4ba5c9394d043fbc5b82)
Signed-off-by: Roman Kiryanov <rkir@google.com>
6 years agoMerge "reference-ril: add owner from emulator team" into pi-dev
TreeHugger Robot [Tue, 6 Mar 2018 22:50:46 +0000 (22:50 +0000)]
Merge "reference-ril: add owner from emulator team" into pi-dev

6 years agoNamespace ril service and properties with "vendor."
Jaekyun Seok [Mon, 26 Feb 2018 04:30:06 +0000 (13:30 +0900)]
Namespace ril service and properties with "vendor."

To prevent property name collisions between properties of system and
vendor, 'vendor.' prefix must be added to a vendor HAL service name and
vendor-specific properties.
You can see the details in http://go/treble-sysprop-compatibility.

These are applied only if PRODUCT_COMPATIBLE_PROPERTY is true.

Bug: 36796459
Bug: 73871799
Test: succeeded building and tested on a taimen device
Change-Id: I45ce47a0f6768bc3f088450a8b4680801a96db7e
Merged-In: I45ce47a0f6768bc3f088450a8b4680801a96db7e
(cherry picked from commit 83035b57fc6f63f4e80c3a424f09a867150e3bbe)

6 years agoreference-ril: add owner from emulator team
bohu [Mon, 5 Mar 2018 18:57:33 +0000 (10:57 -0800)]
reference-ril: add owner from emulator team

The emulator team has been modifying reference-ril
and would like to have a owner on this subdir for
quicker turn around of bug fixes

This cl copied the OWNERS file from hardware/ril
to reference-ril/ and added bohu@

Change-Id: I6598af1827da32f67fed71c732fee111605d1186
(cherry picked from commit c89f255e8bb17cf2b91e4e46b6b5e937a908131f)

6 years agoMerge "Store the system time when NITZ is received." am: 236f668034 am: 0406228af4
Amit Mahajan [Thu, 1 Mar 2018 01:15:20 +0000 (01:15 +0000)]
Merge "Store the system time when NITZ is received." am: 236f668034 am: 0406228af4
am: a2e8af50ea

Change-Id: I74c796651711d5d94d1690018b68a6bd35476251

6 years agoMerge "Store the system time when NITZ is received." am: 236f668034
Amit Mahajan [Thu, 1 Mar 2018 01:10:47 +0000 (01:10 +0000)]
Merge "Store the system time when NITZ is received." am: 236f668034
am: 0406228af4

Change-Id: Iaf9208530732e177c27c0f3ba8c6b28161005c01

6 years agoMerge "Store the system time when NITZ is received."
Amit Mahajan [Thu, 1 Mar 2018 01:06:16 +0000 (01:06 +0000)]
Merge "Store the system time when NITZ is received."
am: 236f668034

Change-Id: I251bb5e0ab7171907d056deb393dd77183f1061e

6 years agoMerge "Store the system time when NITZ is received."
Treehugger Robot [Thu, 1 Mar 2018 01:02:28 +0000 (01:02 +0000)]
Merge "Store the system time when NITZ is received."

6 years agoStore the system time when NITZ is received.
Amit Mahajan [Sat, 24 Feb 2018 01:12:15 +0000 (17:12 -0800)]
Store the system time when NITZ is received.

If cached value for NITZ is used, the time at which it was
received needs to be cached too.

Test: Basic telephony sanity
Bug: 72283604
Change-Id: I8f443171c4583e3eab9be7973d7714ae6c7ab6af

6 years agoAdd support for WiFi in the emulator
Bjoern Johansson [Fri, 10 Feb 2017 06:55:02 +0000 (22:55 -0800)]
Add support for WiFi in the emulator

The way WiFi works in the emulator requires changes to the reference RIL
in setting up interfaces. The interface name and gateway provided by RIL
changes when the emulator indicates support for WiFi. This information
is used to set up default routes which is needed for internet
connectivity.
Exempt-From-Owner-Approval:
Change-Id: I5dface583519ac36d12d16315b059866baaf73a5
(cherry picked from commit 021f5783a6c3c2a9793e3ac46e9ba0c9a6607235)
(cherry picked from commit 4710ed193d827066d08b46d75ce6315a983c7402)
Signed-off-by: Roman Kiryanov <rkir@google.com>
6 years agoMerge "Changed owners" am: 72ee094c8d am: 7c0ce9e778
Jack Yu [Mon, 12 Feb 2018 23:15:22 +0000 (23:15 +0000)]
Merge "Changed owners" am: 72ee094c8d am: 7c0ce9e778
am: 1150e6b738

Change-Id: I1881e2d93d01eea0cd2e902da0a6338d40f22070

6 years agoMerge "Changed owners" am: 72ee094c8d
Jack Yu [Mon, 12 Feb 2018 23:08:53 +0000 (23:08 +0000)]
Merge "Changed owners" am: 72ee094c8d
am: 7c0ce9e778

Change-Id: I977114eac84d377a16522c93f77c617577600f9d

6 years agoMerge "Changed owners"
Jack Yu [Mon, 12 Feb 2018 23:02:02 +0000 (23:02 +0000)]
Merge "Changed owners"
am: 72ee094c8d

Change-Id: Ic84d14a9584d938bc92cc9ceb6bfb3d3044cff3b

6 years agoMerge "Changed owners"
Jack Yu [Mon, 12 Feb 2018 22:37:54 +0000 (22:37 +0000)]
Merge "Changed owners"

6 years agoChanged owners
Jack Yu [Mon, 12 Feb 2018 19:52:36 +0000 (11:52 -0800)]
Changed owners

Test: Build
Change-Id: I1f647165958984380419bb5ca92b9fb141bf43e7

6 years agoAdd flag to disable rild compilation
Naina Nalluri [Wed, 24 Jan 2018 21:08:24 +0000 (13:08 -0800)]
Add flag to disable rild compilation

This change adds a flag to disable rild
compilation. Vendors implementing their
own version should enable this flag in their
device specific make files.

Bug: 71513817
Test: Compile and check the out folder for rild
Change-Id: Ifce51b803adb97e03c9d27b9415dc3fa5714e71e

6 years agoMerge "Revert "reference-ril: fix emulator gateway"" am: fe21a1c2d8 am: bf10103224
Tao Wu [Wed, 24 Jan 2018 08:30:52 +0000 (08:30 +0000)]
Merge "Revert "reference-ril: fix emulator gateway"" am: fe21a1c2d8 am: bf10103224
am: a93069b72b

Change-Id: I495599cfa1207ce0fd712b86f4ff4a0d9a0d44d7

6 years agoMerge "Revert "reference-ril: fix emulator gateway"" am: fe21a1c2d8
Tao Wu [Wed, 24 Jan 2018 08:22:01 +0000 (08:22 +0000)]
Merge "Revert "reference-ril: fix emulator gateway"" am: fe21a1c2d8
am: bf10103224

Change-Id: Ic06fb7d7174dbb992bfa0dd2285ebccd1d34a8a4

6 years agoMerge "Revert "reference-ril: fix emulator gateway""
Tao Wu [Wed, 24 Jan 2018 07:56:31 +0000 (07:56 +0000)]
Merge "Revert "reference-ril: fix emulator gateway""
am: fe21a1c2d8

Change-Id: I3f9c00d934dd998cc90ca6d431930b01b5c7cd3c

6 years agoMerge "Revert "reference-ril: fix emulator gateway""
Tao Wu [Wed, 24 Jan 2018 05:41:01 +0000 (05:41 +0000)]
Merge "Revert "reference-ril: fix emulator gateway""

6 years agoRevert "reference-ril: fix emulator gateway"
Tao Wu [Wed, 24 Jan 2018 00:43:22 +0000 (00:43 +0000)]
Revert "reference-ril: fix emulator gateway"

This reverts commit 0c389bf755acc18fb44dff5f3a32385352e69656.

Reason for revert: the right fix should be r.android.com/597929

Change-Id: Icc97c003b6dee7ada22748950e08cd5e0d5913c8

6 years agoMerge "Avoid possible buffer overflow." am: 5b6c4c4612 am: 9f461fcb2b
Elliott Hughes [Mon, 22 Jan 2018 21:39:07 +0000 (21:39 +0000)]
Merge "Avoid possible buffer overflow." am: 5b6c4c4612 am: 9f461fcb2b
am: 15946ecc29

Change-Id: I945904ff338b30296a1cae508160689758bf55e2

6 years agoMerge "Avoid possible buffer overflow." am: 5b6c4c4612
Elliott Hughes [Mon, 22 Jan 2018 21:34:07 +0000 (21:34 +0000)]
Merge "Avoid possible buffer overflow." am: 5b6c4c4612
am: 9f461fcb2b

Change-Id: Ie47864c9f1f9bfb8a34f276672dffb073d4197b6

6 years agoMerge "Avoid possible buffer overflow."
Elliott Hughes [Mon, 22 Jan 2018 21:26:51 +0000 (21:26 +0000)]
Merge "Avoid possible buffer overflow."
am: 5b6c4c4612

Change-Id: I3b952f06bed1713c451a24b76fb53c39c528d9bc

6 years agoMerge "Avoid possible buffer overflow."
Treehugger Robot [Mon, 22 Jan 2018 20:56:54 +0000 (20:56 +0000)]
Merge "Avoid possible buffer overflow."

6 years agoAvoid possible buffer overflow.
Elliott Hughes [Fri, 19 Jan 2018 23:53:14 +0000 (15:53 -0800)]
Avoid possible buffer overflow.

clang-tidy rightly complains that this code for concatenating two strings
is incorrect because it doesn't take into account the space used by the
first string when appending the second string. Just use snprintf instead.

Bug: N/A
Test: builds, boots
Change-Id: Ifdaff43a87301a876369635013516aab41cd48c3

6 years agoMerge "Add carrierKeyLength parameter in RIL_CarrierInfoForImsiEncryption structure...
Youngrak Lee [Tue, 19 Dec 2017 22:35:58 +0000 (22:35 +0000)]
Merge "Add carrierKeyLength parameter in RIL_CarrierInfoForImsiEncryption structure" am: 94ae999327 am: 4c6991b2d0
am: 7a264eede9

Change-Id: I5abdc403bb8567aaf44db00c11a1be4360141e2c

6 years agoMerge "Add carrierKeyLength parameter in RIL_CarrierInfoForImsiEncryption structure...
Youngrak Lee [Tue, 19 Dec 2017 22:29:55 +0000 (22:29 +0000)]
Merge "Add carrierKeyLength parameter in RIL_CarrierInfoForImsiEncryption structure" am: 94ae999327
am: 4c6991b2d0

Change-Id: I89352fde3265b8dfe52ba3d892fef25aef5bb043

6 years agoMerge "Add carrierKeyLength parameter in RIL_CarrierInfoForImsiEncryption structure"
Youngrak Lee [Tue, 19 Dec 2017 22:23:33 +0000 (22:23 +0000)]
Merge "Add carrierKeyLength parameter in RIL_CarrierInfoForImsiEncryption structure"
am: 94ae999327

Change-Id: I98757b762a57b7e9039909a9371250791e42b8b4

6 years agoMerge "Add carrierKeyLength parameter in RIL_CarrierInfoForImsiEncryption structure"
Treehugger Robot [Tue, 19 Dec 2017 21:52:43 +0000 (21:52 +0000)]
Merge "Add carrierKeyLength parameter in RIL_CarrierInfoForImsiEncryption structure"

6 years agoFix double freeing of memory in SAP service and add null-checks.
Gohulan Balachandran [Fri, 20 Oct 2017 16:37:52 +0000 (09:37 -0700)]
Fix double freeing of memory in SAP service and add null-checks.

The payload of a SAP request could be freed twice in certain scenarios.
Also, add null-checks to prevent dereferencing of null pointers.

Bug: 64729356
Test: Manually run the fuzz tests and ensure that there is no crash in
      rild

Change-Id: Ib7ae269fa5297d6acea267337b220b8858c82bae

6 years agoMerge "Fix more VTS HAL Radio tests" am: fe30db5e3d am: 5401fe91a0
Jim Kaye [Tue, 12 Dec 2017 02:52:34 +0000 (02:52 +0000)]
Merge "Fix more VTS HAL Radio tests" am: fe30db5e3d am: 5401fe91a0
am: 307b3d98d1

Change-Id: I12e707b986a478cc7dd3869503aaf2b70cacd69a

6 years agoMerge "Fix more VTS HAL Radio tests" am: fe30db5e3d
Jim Kaye [Tue, 12 Dec 2017 02:04:19 +0000 (02:04 +0000)]
Merge "Fix more VTS HAL Radio tests" am: fe30db5e3d
am: 5401fe91a0

Change-Id: I480c2b1af55542acee823d7e982a127588d4cab1

6 years agoMerge "Fix more VTS HAL Radio tests"
Jim Kaye [Tue, 12 Dec 2017 01:40:21 +0000 (01:40 +0000)]
Merge "Fix more VTS HAL Radio tests"
am: fe30db5e3d

Change-Id: I543ecc9e1b992f7b54e8dc7998c4e22076b2cd04

6 years agoMerge "Fix more VTS HAL Radio tests"
Jim Kaye [Tue, 12 Dec 2017 01:23:02 +0000 (01:23 +0000)]
Merge "Fix more VTS HAL Radio tests"

6 years agoMerge "DO NOT MERGE: Merge Oreo MR1 into master" am: 6e9db34e73 -s ours am: 0dedc7e41f
Xin Li [Fri, 8 Dec 2017 04:52:00 +0000 (04:52 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 6e9db34e73  -s ours am: 0dedc7e41f
am: 5f9fbd5437  -s ours

Change-Id: I7d963418fb15c7d6f83fa61f00fadd5ea2ab6ec0

6 years agoManually merge changes from giant AOSP topic
Stephen Li [Thu, 7 Dec 2017 23:32:18 +0000 (23:32 +0000)]
Manually merge changes from giant AOSP topic

Change-Id: I6fefa3e010a11d438ea1867a5062d185b4682c27

6 years agoFix more VTS HAL Radio tests
Jim Kaye [Thu, 7 Dec 2017 22:06:22 +0000 (14:06 -0800)]
Fix more VTS HAL Radio tests

With VTS 8.0 r4, 16 new VTS failures appeared in the
Emulator. These failures were all due to unexpected
responses (some error, some no-error) from the Radio
Interface Layer.

This CL has reference-ril give the expected responses.

With this CL, 122 of 129 of these tests pass (again).

(The remaining 7 tests still fail. These 7 are
related to SAP.)

The 16 previously-failing tests were in
HidlHalGTest#RadioHidlTest:

    setNetworkSelectionModeAutomatic_32bit
    startLceService_32bit
    pullLceData_32bit
    sendSms_32bit
    sendSMSExpectMore_32bit
    acknowledgeLastIncomingGsmSms_32bit
    sendCdmaSms_32bit
    writeSmsToSim_32bit
    hangup_32bit
    hangupWaitingOrBackground_32bit
    hangupForegroundResumeBackground_32bit
    switchWaitingOrHoldingAndActive_32bit
    conference_32bit
    rejectCall_32bit
    cancelPendingUssd_32bit
    separateConnection_32bit

Bug: 62137708

Test: VTS tests: VtsHalRadioV1_0Target

Change-Id: Ic1d89e1d09d8ef1976cb6b78c863a84d7b1505e1

6 years agoMerge "DO NOT MERGE: Merge Oreo MR1 into master" am: 6e9db34e73 -s ours
Xin Li [Thu, 7 Dec 2017 12:41:28 +0000 (12:41 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 6e9db34e73  -s ours
am: 0dedc7e41f

Change-Id: I78ac7406d97accf15e1f76156f7530fcdf106ee8

6 years agoMerge "DO NOT MERGE: Merge Oreo MR1 into master"
Xin Li [Thu, 7 Dec 2017 12:36:02 +0000 (12:36 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: 6e9db34e73  -s ours

Change-Id: Iade198360cbd966d01c327baa8bbc5c5b83b5563

6 years agoDO NOT MERGE: Merge Oreo MR1 into master am: 2df16423fc -s ours
Xin Li [Thu, 7 Dec 2017 06:50:37 +0000 (06:50 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master am: 2df16423fc  -s ours
am: 06fcf6acc8

Change-Id: Id201662759943f7eea92538a45bf87723cca459e

6 years agoDO NOT MERGE: Merge Oreo MR1 into master
Xin Li [Thu, 7 Dec 2017 04:22:25 +0000 (04:22 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master
am: 2df16423fc  -s ours

Change-Id: I7f14d89da3fee380de7d4e121ec04a7d2852a33e

6 years agoMerge "DO NOT MERGE: Merge Oreo MR1 into master"
Xin Li [Wed, 6 Dec 2017 23:18:26 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"

6 years agoDO NOT MERGE: Merge Oreo MR1 into master
Xin Li [Wed, 6 Dec 2017 19:52:05 +0000 (11:52 -0800)]
DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Iaf61e3676369884c84ed7a77f066fcd89b3ac1e7

6 years agoAdd carrierKeyLength parameter in RIL_CarrierInfoForImsiEncryption structure
Youngrak Lee [Sun, 3 Dec 2017 18:50:37 +0000 (10:50 -0800)]
Add carrierKeyLength parameter in RIL_CarrierInfoForImsiEncryption structure

Bug: 69477444
CRs-Fixed: 2145759
Test: Manual

Change-Id: I10b4ebee981b8b74be75aa2237294db64bdfc5de

6 years agoMerge "Use -Werror in hardware/ril/librilutils" am: d5ee11ddc9 am: a46c52ee4d
Chih-Hung Hsieh [Mon, 20 Nov 2017 20:36:52 +0000 (20:36 +0000)]
Merge "Use -Werror in hardware/ril/librilutils" am: d5ee11ddc9 am: a46c52ee4d
am: 519bc88226

Change-Id: Iab9c5869edae9b17e8d070348b0b504a53b6621e

6 years agoMerge "Use -Werror in hardware/ril/librilutils" am: d5ee11ddc9
Chih-Hung Hsieh [Mon, 20 Nov 2017 20:34:24 +0000 (20:34 +0000)]
Merge "Use -Werror in hardware/ril/librilutils" am: d5ee11ddc9
am: a46c52ee4d

Change-Id: I8702779387c84370ea9a46d3fd518b62bfe82dc8

6 years agoMerge "Use -Werror in hardware/ril/librilutils"
Chih-Hung Hsieh [Mon, 20 Nov 2017 20:32:53 +0000 (20:32 +0000)]
Merge "Use -Werror in hardware/ril/librilutils"
am: d5ee11ddc9

Change-Id: I9283deec334d28a325a3130868294f58a192be53

6 years agoMerge "Use -Werror in hardware/ril/librilutils"
Treehugger Robot [Mon, 20 Nov 2017 20:21:01 +0000 (20:21 +0000)]
Merge "Use -Werror in hardware/ril/librilutils"

6 years agoUse -Werror in hardware/ril/librilutils
Chih-Hung Hsieh [Mon, 20 Nov 2017 18:32:50 +0000 (10:32 -0800)]
Use -Werror in hardware/ril/librilutils

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I686a263ce0d61444cac9cba546bf5966124e0f49

6 years agoMerge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Xin Li [Wed, 15 Nov 2017 01:18:28 +0000 (01:18 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 2e028b4e39

Change-Id: I4b976ed6b15db4bfb5757bd974fb8e7737a69dc0

6 years agoMerge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Xin Li [Wed, 15 Nov 2017 00:38:21 +0000 (16:38 -0800)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: Ia544030482f2f694bd009e2e5b39d599dd20b92e

6 years agoMerge commit 'd0eaef9aaf46fe3e8a54eeb81601200fe39ab07d' into HEAD
Xin Li [Mon, 13 Nov 2017 22:35:41 +0000 (14:35 -0800)]
Merge commit 'd0eaef9aaf46fe3e8a54eeb81601200fe39ab07d' into HEAD

Change-Id: I1810fcc6011e0de8e8d053f2cc52d3527d0b6be6

6 years agoMerge "Sending empty strings instead of NULL for some RIL requests" am: d426ee3f5d...
Ruthwar Kumar Ambeer [Fri, 27 Oct 2017 23:23:15 +0000 (23:23 +0000)]
Merge "Sending empty strings instead of NULL for some RIL requests" am: d426ee3f5d am: c66ede5c8d
am: a1e3942d83

Change-Id: I175b45a6984e132c4f8e9b6b71024295872ec89b

6 years agoMerge "Sending empty strings instead of NULL for some RIL requests" am: d426ee3f5d
Ruthwar Kumar Ambeer [Fri, 27 Oct 2017 23:17:14 +0000 (23:17 +0000)]
Merge "Sending empty strings instead of NULL for some RIL requests" am: d426ee3f5d
am: c66ede5c8d

Change-Id: I0da827956be791d548b88b74d7e663b957ac4538

6 years agoMerge "Sending empty strings instead of NULL for some RIL requests"
Ruthwar Kumar Ambeer [Fri, 27 Oct 2017 23:11:44 +0000 (23:11 +0000)]
Merge "Sending empty strings instead of NULL for some RIL requests"
am: d426ee3f5d

Change-Id: I8cc04058e461e61a4d23380b0769baec96e2cf6b

6 years agoMerge "Sending empty strings instead of NULL for some RIL requests"
Treehugger Robot [Fri, 27 Oct 2017 23:04:36 +0000 (23:04 +0000)]
Merge "Sending empty strings instead of NULL for some RIL requests"

6 years agoSending empty strings instead of NULL for some RIL requests
Ruthwar Kumar Ambeer [Thu, 23 Mar 2017 12:08:56 +0000 (17:38 +0530)]
Sending empty strings instead of NULL for some RIL requests

Some vendor RILs expect empty string instead of NULL pointer
for certain RIL requets. For RIL_REQUEST_ENTER_SIM_PIN,
RIL_REQUEST_ENTER_SIM_PUK, RIL_REQUEST_ENTER_SIM_PIN2,
RIL_REQUEST_ENTER_SIM_PUK2, RIL_REQUEST_CHANGE_SIM_PIN,
RIL_REQUEST_CHANGE_SIM_PIN2,
RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION
RIL_REQUEST_SETUP_DATA_CALL,
RIL_REQUEST_SET_INITIAL_ATTACH_APN, RIL_REQUEST_SET_DATA_PROFILE,
RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION,
RIL_REQUEST_SET_FACILITY_LOCK,
RIL_REQUEST_CHANGE_BARRING_PASSWORD, sending empty string instead
of NULL.

Test: Manual
Bug: 3778268365653485
Change-Id: I6627c8a12e096b9ac8ebe08e734782cfa951c488

6 years agoMerge "Fix VTS HAL Radio tests" am: 4af7529e39 am: 9e633f3956 am: 61e17974bc
Jim Kaye [Wed, 18 Oct 2017 01:40:47 +0000 (01:40 +0000)]
Merge "Fix VTS HAL Radio tests" am: 4af7529e39 am: 9e633f3956 am: 61e17974bc
am: d0eaef9aaf

Change-Id: I05b461626d7d802a1a9cbdc9001ca30a85c924c9

6 years agoMerge "Fix VTS HAL Radio tests" am: 4af7529e39 am: 9e633f3956
Jim Kaye [Wed, 18 Oct 2017 01:16:28 +0000 (01:16 +0000)]
Merge "Fix VTS HAL Radio tests" am: 4af7529e39 am: 9e633f3956
am: 61e17974bc

Change-Id: I902e8a3e0c5dd30906c9b93fea64ac563f90ec54

6 years agoMerge "Fix VTS HAL Radio tests" am: 4af7529e39
Jim Kaye [Wed, 18 Oct 2017 01:11:32 +0000 (01:11 +0000)]
Merge "Fix VTS HAL Radio tests" am: 4af7529e39
am: 9e633f3956

Change-Id: I29c620aeff2ad581c52947ebe4d8d0477aaa6eb3

6 years agoMerge "Fix VTS HAL Radio tests"
Jim Kaye [Wed, 18 Oct 2017 01:06:59 +0000 (01:06 +0000)]
Merge "Fix VTS HAL Radio tests"
am: 4af7529e39

Change-Id: I6204d090a9d4b527eee00e5ed76ec15cb4769176

6 years agoMerge "Fix VTS HAL Radio tests"
Treehugger Robot [Wed, 18 Oct 2017 00:57:34 +0000 (00:57 +0000)]
Merge "Fix VTS HAL Radio tests"

6 years agoFix VTS HAL Radio tests
Jim Kaye [Fri, 6 Oct 2017 21:17:47 +0000 (14:17 -0700)]
Fix VTS HAL Radio tests

Get VTS HAL Radio tests working for Emulator.

With this CL, 122 of 129 of these tests pass.

(The remaining 7 tests still fail. These are
related to SAP.)

Bug: 62137708

Test: VTS tests: VtsHalRadioV1_0Target

Merged from If8b100c448f7f6b605d28af6a2ac2f03197c0137

Change-Id: Ieab832ab1a836087ca0f6d542128520000fffc71

6 years agoMerge "Fix rild crash" am: 3e8f2c80f4 am: 398177045e am: 09f5a3e63a
Pankaj Kanwar [Tue, 10 Oct 2017 00:10:49 +0000 (00:10 +0000)]
Merge "Fix rild crash" am: 3e8f2c80f4 am: 398177045e am: 09f5a3e63a
am: b330947088

Change-Id: I1323c87a145136d0208376b56cc8cd7a60ed6838

6 years agoMerge "Fix rild crash" am: 3e8f2c80f4 am: 398177045e
Pankaj Kanwar [Tue, 10 Oct 2017 00:00:23 +0000 (00:00 +0000)]
Merge "Fix rild crash" am: 3e8f2c80f4 am: 398177045e
am: 09f5a3e63a

Change-Id: I01ce32f5c2f8fb2c2c558dc9d81e037ce9183757

6 years agoMerge "Fix rild crash" am: 3e8f2c80f4
Pankaj Kanwar [Mon, 9 Oct 2017 23:58:15 +0000 (23:58 +0000)]
Merge "Fix rild crash" am: 3e8f2c80f4
am: 398177045e

Change-Id: Ib7b44b87ef125c9453bde30e90bbfdf88d48105c

6 years agoMerge "Fix rild crash"
Pankaj Kanwar [Mon, 9 Oct 2017 23:56:17 +0000 (23:56 +0000)]
Merge "Fix rild crash"
am: 3e8f2c80f4

Change-Id: Ic5cce3964d5d0a9282b39d81b416bc9a67afd4ea

6 years agoMerge "Fix rild crash"
Pankaj Kanwar [Mon, 9 Oct 2017 23:50:58 +0000 (23:50 +0000)]
Merge "Fix rild crash"

6 years agoMerge "reference-ril: fix emulator gateway" am: a66fd94317 am: 82ab4714c8 am: 5d16d0f41f
bohu [Wed, 4 Oct 2017 21:23:45 +0000 (21:23 +0000)]
Merge "reference-ril: fix emulator gateway" am: a66fd94317 am: 82ab4714c8 am: 5d16d0f41f
am: 82aa01c94c

Change-Id: I3dc4f074c67ac06cfb95fbb6cce8404f77d33bd7

6 years agoMerge "reference-ril: fix emulator gateway" am: a66fd94317 am: 82ab4714c8
bohu [Wed, 4 Oct 2017 21:05:36 +0000 (21:05 +0000)]
Merge "reference-ril: fix emulator gateway" am: a66fd94317 am: 82ab4714c8
am: 5d16d0f41f

Change-Id: Ib79c54fd107b418f7a457f04d5284cd7fad0cb78

6 years agoMerge "reference-ril: fix emulator gateway" am: a66fd94317
bohu [Wed, 4 Oct 2017 20:54:17 +0000 (20:54 +0000)]
Merge "reference-ril: fix emulator gateway" am: a66fd94317
am: 82ab4714c8

Change-Id: I27ec52464d4e205944afbcaac7136d04d4d4ec3f

6 years agoMerge "reference-ril: fix emulator gateway"
bohu [Wed, 4 Oct 2017 20:45:31 +0000 (20:45 +0000)]
Merge "reference-ril: fix emulator gateway"
am: a66fd94317

Change-Id: I0d2dd97cf0bd96d4d1a25d51265599c97108fea7

6 years agoMerge "reference-ril: fix emulator gateway"
Treehugger Robot [Wed, 4 Oct 2017 20:28:52 +0000 (20:28 +0000)]
Merge "reference-ril: fix emulator gateway"

6 years agoreference-ril: fix emulator gateway
bohu [Wed, 4 Oct 2017 14:16:19 +0000 (07:16 -0700)]
reference-ril: fix emulator gateway

BUG: 67221233
Change-Id: I2927d5ca9887f9cd23a810c097b3bbd0756a49b7

6 years agoMerge "Fix docstrings for RIL_CellIdentity" am: 9fbd65c441 am: 9e713864c1 am: be932dc...
nharold [Fri, 15 Sep 2017 09:23:42 +0000 (09:23 +0000)]
Merge "Fix docstrings for RIL_CellIdentity" am: 9fbd65c441 am: 9e713864c1 am: be932dc8f7  -s ours
am: b10b8292ca  -s ours

Change-Id: Idcea7f0975695f9d4841a05fb2f1d333a7a21746

6 years agoMerge "Fix docstrings for RIL_CellIdentity" am: 9fbd65c441 am: 9e713864c1
nharold [Fri, 15 Sep 2017 03:32:55 +0000 (03:32 +0000)]
Merge "Fix docstrings for RIL_CellIdentity" am: 9fbd65c441 am: 9e713864c1
am: be932dc8f7  -s ours

Change-Id: Ib47e8ddb84065a533d9c47a79c0784ebd1c00476

6 years agoMerge "Fix docstrings for RIL_CellIdentity" am: 9fbd65c441
nharold [Fri, 15 Sep 2017 02:05:45 +0000 (02:05 +0000)]
Merge "Fix docstrings for RIL_CellIdentity" am: 9fbd65c441
am: 9e713864c1

Change-Id: I133eef845711ddffa1f2cddbbd53f1a6834911c0

6 years agoMerge "Fix docstrings for RIL_CellIdentity"
nharold [Fri, 15 Sep 2017 00:58:02 +0000 (00:58 +0000)]
Merge "Fix docstrings for RIL_CellIdentity"
am: 9fbd65c441

Change-Id: Ic4b83ab811bb645c83a7a24530b5fe4a599b2f1e

6 years agoMerge "Fix docstrings for RIL_CellIdentity"
nharold [Thu, 14 Sep 2017 23:47:45 +0000 (23:47 +0000)]
Merge "Fix docstrings for RIL_CellIdentity"

6 years agoMerge "Fix Sap Service" am: 35629b94bd am: 169d02b508 am: 9e60b87b17 -s ours
Shuo Qian [Thu, 14 Sep 2017 02:54:59 +0000 (02:54 +0000)]
Merge "Fix Sap Service" am: 35629b94bd am: 169d02b508 am: 9e60b87b17  -s ours
am: 826bd64c33  -s ours

Change-Id: Ic211e8584525596e4eed68dcbe205dda8f74a404

6 years agoMerge "Fix Sap Service" am: 35629b94bd am: 169d02b508
Shuo Qian [Thu, 14 Sep 2017 00:48:19 +0000 (00:48 +0000)]
Merge "Fix Sap Service" am: 35629b94bd am: 169d02b508
am: 9e60b87b17  -s ours

Change-Id: I01f4c324a7bb90ef26ceb16dbdce6b60f0d8071d

6 years agoMerge "Fix Sap Service" am: 35629b94bd
Shuo Qian [Wed, 13 Sep 2017 23:08:12 +0000 (23:08 +0000)]
Merge "Fix Sap Service" am: 35629b94bd
am: 169d02b508

Change-Id: I7d56aaaeb77316141a475a6be3cc954c4013ff5a

6 years agoMerge "Fix Sap Service"
Shuo Qian [Wed, 13 Sep 2017 22:43:55 +0000 (22:43 +0000)]
Merge "Fix Sap Service"
am: 35629b94bd

Change-Id: I87110a6484f9713c71dff1e8a2581b3a9d15de51

6 years agoMerge "Fix Sap Service"
Shuo Qian [Wed, 13 Sep 2017 20:12:57 +0000 (20:12 +0000)]
Merge "Fix Sap Service"

6 years agoFix docstrings for RIL_CellIdentity am: ae339b3feb
Nathan Harold [Wed, 13 Sep 2017 20:11:53 +0000 (20:11 +0000)]
Fix docstrings for RIL_CellIdentity am: ae339b3feb
am: cc174ffc7a

Change-Id: I429705403bad9195b185c7924e01d30fc0e549f8

6 years agoFix docstrings for RIL_CellIdentity
Nathan Harold [Wed, 13 Sep 2017 19:43:20 +0000 (19:43 +0000)]
Fix docstrings for RIL_CellIdentity
am: ae339b3feb

Change-Id: Ib216d068ab39f9eb0c7f4841a26eba7d8bca918c