OSDN Git Service

android-x86/hardware-ril.git
6 years agoEmulator: use RIL_CellInfo_v12 am: 2d9f8af0f6
bohu [Tue, 13 Mar 2018 17:16:30 +0000 (17:16 +0000)]
Emulator: use RIL_CellInfo_v12 am: 2d9f8af0f6
am: 830619589f

Change-Id: I02cc1961df4667effa06b8225adabd3df5913c6c

6 years agoEmulator: use APPTYPE_USIM instead of APPTYPE_SIM am: 48170a0b6c
bohu [Tue, 13 Mar 2018 17:15:12 +0000 (17:15 +0000)]
Emulator: use APPTYPE_USIM instead of APPTYPE_SIM am: 48170a0b6c
am: 14e105957d

Change-Id: I16882988c06ea75a0e93e0ad917bc311943721dd

6 years agoEmulator: use RIL_CellInfo_v12
bohu [Tue, 13 Mar 2018 17:04:44 +0000 (17:04 +0000)]
Emulator: use RIL_CellInfo_v12
am: 2d9f8af0f6

Change-Id: Ibddafd96ca06dc5a992a079a3df04133c783da2d

6 years agoEmulator: use APPTYPE_USIM instead of APPTYPE_SIM
bohu [Tue, 13 Mar 2018 17:03:43 +0000 (17:03 +0000)]
Emulator: use APPTYPE_USIM instead of APPTYPE_SIM
am: 48170a0b6c

Change-Id: I2a343195993bbefca4079fae3388442667681bf0

6 years agoSnap for 4651078 from 8c1da5b30cd4e01dd587d0b7ada8383b54b63879 to pi-release
android-build-team Robot [Tue, 13 Mar 2018 09:44:18 +0000 (09:44 +0000)]
Snap for 4651078 from 8c1da5b30cd4e01dd587d0b7ada8383b54b63879 to pi-release

Change-Id: Ie83246c96cfe9211d1fd3f2d44dae03ab8ffd1d1

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 am: 8c1da5b30c
bohu [Mon, 12 Mar 2018 22:33:43 +0000 (22:33 +0000)]
Emulator: set correct MEID for non-CDMA phone am: 8c1da5b30c
am: 62eb95fc01

Change-Id: I6bf9e5119c8a29dd285d437b88f5ff0670ad288d

6 years agoMerge "libril: Protect against NULL unsolicited response function" am: f6b6550f24...
D. Andrei Măceș [Mon, 12 Mar 2018 22:05:03 +0000 (22:05 +0000)]
Merge "libril: Protect against NULL unsolicited response function" am: f6b6550f24 am: 5a01e12008
am: 9375b00695

Change-Id: Ic63885caff6629e3deb967455a3a5fb870822ede

6 years agoEmulator: set correct MEID for non-CDMA phone
bohu [Mon, 12 Mar 2018 21:16:11 +0000 (21:16 +0000)]
Emulator: set correct MEID for non-CDMA phone
am: 8c1da5b30c

Change-Id: Ib9b114d9007635f9dda0241752cfb26ebf0a01ae

6 years agoMerge "libril: Protect against NULL unsolicited response function" am: f6b6550f24
D. Andrei Măceș [Mon, 12 Mar 2018 21:05:53 +0000 (21:05 +0000)]
Merge "libril: Protect against NULL unsolicited response function" am: f6b6550f24
am: 5a01e12008

Change-Id: I1706fc70f36f93f795e3b38a76a2e65017ad2ec8

6 years agoMerge "libril: Protect against NULL unsolicited response function"
D. Andrei Măceș [Mon, 12 Mar 2018 20:55:54 +0000 (20:55 +0000)]
Merge "libril: Protect against NULL unsolicited response function"
am: f6b6550f24

Change-Id: I4a150bb510c25f5d06603d82746c5eeecf125362

6 years agoMerge "libril: Protect against NULL unsolicited response function"
Treehugger Robot [Mon, 12 Mar 2018 20:35:37 +0000 (20:35 +0000)]
Merge "libril: Protect against NULL unsolicited response function"

6 years agoSnap for 4647811 from efa3401c716b8d090afbd9a6a1022f111a041b9a to pi-release
android-build-team Robot [Sun, 11 Mar 2018 08:23:41 +0000 (08:23 +0000)]
Snap for 4647811 from efa3401c716b8d090afbd9a6a1022f111a041b9a to pi-release

Change-Id: I48c4f23e945a8e2e270656dea3b386683414cb67

6 years agoEmulator: support querying device identity am: efa3401c71
bohu [Sat, 10 Mar 2018 09:55:08 +0000 (09:55 +0000)]
Emulator: support querying device identity am: efa3401c71
am: 3c5aab1fb9

Change-Id: I9e601e53febbba5038cfba38505aaee712418ce2

6 years agoEmulator: support querying device identity
bohu [Sat, 10 Mar 2018 06:40:35 +0000 (06:40 +0000)]
Emulator: support querying device identity
am: efa3401c71

Change-Id: I30c1a653b9f927a6b4f4b750eb4125555d1a11d4

6 years agolibril: Protect against NULL unsolicited response function
D. Andrei Măceș [Sat, 7 Oct 2017 15:07:00 +0000 (18:07 +0300)]
libril: Protect against NULL unsolicited response function

Upstream change I732234a22328a1bfcb603bb020547f543b6fd766 makes
RIL_UNSOL_DC_RT_INFO_CHANGED's responseFunction() NULL, without
protecting against it in RIL_onUnsolicitedResponse(), thus crash-
ing at least hammerhead's RIL stack upon mobile data connection.

https://android-review.googlesource.com/#/c/platform/hardware/ril/+/345950/

Change-Id: I6567019cb6daf6492a29e04cc9872e69b2ba456d
Signed-off-by: D. Andrei Măceș <Andrei.Maces@alumni.nd.edu>
6 years agoUse system property gateway if not using WiFi am: bc497e700e
Bjoern Johansson [Sat, 10 Mar 2018 00:32:26 +0000 (00:32 +0000)]
Use system property gateway if not using WiFi am: bc497e700e
am: 13657d2cda

Change-Id: I204e26975a3c61494b8aac99bd085b4e8ba7aec8

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 agoUse system property gateway if not using WiFi
Bjoern Johansson [Fri, 9 Mar 2018 23:31:33 +0000 (23:31 +0000)]
Use system property gateway if not using WiFi
am: bc497e700e

Change-Id: Ib6cbc213e2c670658fa0d162f156c961e0c11aac

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 agoSnap for 4641295 from d20f07743b64e7670cb8e69e01b8c3ac55cea160 to pi-release
android-build-team Robot [Thu, 8 Mar 2018 08:23:25 +0000 (08:23 +0000)]
Snap for 4641295 from d20f07743b64e7670cb8e69e01b8c3ac55cea160 to pi-release

Change-Id: I8dd08888d66fb188a2968b05a31ebda1e6f46302

6 years agoMerge "Enable/disable radio interface on setup/deactivate" into pi-dev am: d20f07743b
Bjoern Johansson [Thu, 8 Mar 2018 02:20:36 +0000 (02:20 +0000)]
Merge "Enable/disable radio interface on setup/deactivate" into pi-dev am: d20f07743b
am: 1fb362bfd0

Change-Id: If99dc3660bb27f2c457625cc3446bf14856d0dc5

6 years agoMerge "Enable/disable radio interface on setup/deactivate" into pi-dev
Bjoern Johansson [Thu, 8 Mar 2018 02:00:46 +0000 (02:00 +0000)]
Merge "Enable/disable radio interface on setup/deactivate" into pi-dev
am: d20f07743b

Change-Id: I0636ab07751bfe78b53bd9bf590baff2c7365e67

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 agoSnap for 4638586 from 9169039be9b6ec2076a8b9b655a227f8a87dfb36 to pi-release
android-build-team Robot [Wed, 7 Mar 2018 08:27:51 +0000 (08:27 +0000)]
Snap for 4638586 from 9169039be9b6ec2076a8b9b655a227f8a87dfb36 to pi-release

Change-Id: I20205600179d3ce9ce13c90f95fe3b1999275e1f

6 years agoMerge "reference-ril: add owner from emulator team" into pi-dev am: 9169039be9
bohu [Wed, 7 Mar 2018 01:56:02 +0000 (01:56 +0000)]
Merge "reference-ril: add owner from emulator team" into pi-dev am: 9169039be9
am: 69d9a86243

Change-Id: I5d2bb89162ffec1de42a38e68753a400e369f223

6 years agoNamespace ril service and properties with "vendor." am: 1b4e637ead
Jaekyun Seok [Wed, 7 Mar 2018 00:41:45 +0000 (00:41 +0000)]
Namespace ril service and properties with "vendor." am: 1b4e637ead
am: 603282d35e  -s ours

Change-Id: I2a434b46f6981fbdc976347429011dae5e1498f0

6 years agoMerge "reference-ril: add owner from emulator team" into pi-dev
bohu [Wed, 7 Mar 2018 00:31:40 +0000 (00:31 +0000)]
Merge "reference-ril: add owner from emulator team" into pi-dev
am: 9169039be9

Change-Id: Ib6a289ab04738c0981ae9c87158ead0b53312c18

6 years agoNamespace ril service and properties with "vendor."
Jaekyun Seok [Tue, 6 Mar 2018 22:51:41 +0000 (22:51 +0000)]
Namespace ril service and properties with "vendor."
am: 1b4e637ead

Change-Id: Ifa5e49c1eeffb8636ce567e22d86847228f889fb

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 agoMerge "Namespace ril service and properties with "vendor.""
TreeHugger Robot [Tue, 6 Mar 2018 03:08:35 +0000 (03:08 +0000)]
Merge "Namespace ril service and properties with "vendor.""

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

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

6 years agoSnap for 4628106 from b67d8eb090caca72d1c1f0e7a726b6f13bfaa4d9 to pi-release
android-build-team Robot [Thu, 1 Mar 2018 08:23:47 +0000 (08:23 +0000)]
Snap for 4628106 from b67d8eb090caca72d1c1f0e7a726b6f13bfaa4d9 to pi-release

Change-Id: I2cb604520db42f9941c65b99297a06bbb3269b7b

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 agoSnap for 4623514 from a8bec8983b382917b517e97fa09be5afda468b0c to pi-release
android-build-team Robot [Tue, 27 Feb 2018 08:27:39 +0000 (08:27 +0000)]
Snap for 4623514 from a8bec8983b382917b517e97fa09be5afda468b0c to pi-release

Change-Id: I13f6e477db378a280d9091ce284c4dc7c34db162

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 agoSnap for 4600820 from 9dc8fcd49129caf8e649eef289130269bd4d89d4 to pi-release
android-build-team Robot [Tue, 13 Feb 2018 08:41:52 +0000 (08:41 +0000)]
Snap for 4600820 from 9dc8fcd49129caf8e649eef289130269bd4d89d4 to pi-release

Change-Id: I8f736ae76b547e64ec2d7732147fdc9a6ace777a

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 agomerge in pi-release history after reset to master
gitbuildkicker [Mon, 29 Jan 2018 22:54:47 +0000 (14:54 -0800)]
merge in pi-release history after reset to master

6 years agomerge in pi-release history after reset to master
gitbuildkicker [Mon, 29 Jan 2018 19:54:57 +0000 (11:54 -0800)]
merge in pi-release history after reset to master

6 years agoSnap for 4571561 from 4600c0ce6ff346a58841b5e4a2e56cf6fed473dd to pi-release
android-build-team Robot [Sun, 28 Jan 2018 08:20:25 +0000 (08:20 +0000)]
Snap for 4571561 from 4600c0ce6ff346a58841b5e4a2e56cf6fed473dd to pi-release

Change-Id: Ib2db524107415bb22c2b3650d4c8b29b3d36b886

6 years agoSnap for 4565898 from 716f96749d242cdf9e4e6c3036705f6495477af3 to pi-release
android-build-team Robot [Thu, 25 Jan 2018 09:06:30 +0000 (09:06 +0000)]
Snap for 4565898 from 716f96749d242cdf9e4e6c3036705f6495477af3 to pi-release

Change-Id: I075a94db64ff74204fea0d0a65e432e0d60d6627

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 in pi-release history after reset to master
gitbuildkicker [Tue, 23 Jan 2018 22:19:56 +0000 (14:19 -0800)]
merge in pi-release history after reset to master

6 years agomerge in pi-release history after reset to master
gitbuildkicker [Tue, 23 Jan 2018 20:12:37 +0000 (12:12 -0800)]
merge in pi-release history after reset to master

6 years agoSnap for 4560043 from 5a5fea16d9f36fec04588f11c952136a89c0afe4 to pi-release
android-build-team Robot [Tue, 23 Jan 2018 08:28:45 +0000 (08:28 +0000)]
Snap for 4560043 from 5a5fea16d9f36fec04588f11c952136a89c0afe4 to pi-release

Change-Id: If05eb445cc6adf5b1d200ed87c54d8c638fdff9c

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 agoSnap for 4511918 from 53ad95ded82391507a7c516ff317385becdb2025 to pi-release
android-build-team Robot [Wed, 20 Dec 2017 18:52:48 +0000 (18:52 +0000)]
Snap for 4511918 from 53ad95ded82391507a7c516ff317385becdb2025 to pi-release

Change-Id: Icf1fb91bc4823e01eece288532fe3742218355ae

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 agoSnap for 4507345 from 46b28ccee1c2411dd3611969a842e6d23cc7460d to pi-release
android-build-team Robot [Sun, 17 Dec 2017 08:33:27 +0000 (08:33 +0000)]
Snap for 4507345 from 46b28ccee1c2411dd3611969a842e6d23cc7460d to pi-release

Change-Id: I242dde7276ff16673440829322ef554060144c08

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 agoSnap for 4498106 from 3404904b580b86c9c143d1978f19ecd199e9692b to pi-release
android-build-team Robot [Tue, 12 Dec 2017 08:35:35 +0000 (08:35 +0000)]
Snap for 4498106 from 3404904b580b86c9c143d1978f19ecd199e9692b to pi-release

Change-Id: Ib538d957a9181bf0e67e1e450423bc4675fc0c97

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 agoSnap for 4496165 from 773c4b2fbe4ef8e09ea0ace3945127fc74db48e6 to pi-release
android-build-team Robot [Mon, 11 Dec 2017 12:00:14 +0000 (12:00 +0000)]
Snap for 4496165 from 773c4b2fbe4ef8e09ea0ace3945127fc74db48e6 to pi-release

Change-Id: I0aa79f47fd6cc5c73aeabd90305c19081f4c5024

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 agoSnap for 4462748 from 9787f3cac2dc96e3a36d9acef6a766dcf5db90d5 to pi-release
android-build-team Robot [Tue, 21 Nov 2017 08:21:39 +0000 (08:21 +0000)]
Snap for 4462748 from 9787f3cac2dc96e3a36d9acef6a766dcf5db90d5 to pi-release

Change-Id: Ie33284403f3bcdcd2468a3585dcb86a9dfe32276

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 agoSnap for 4453288 from 5403b3eaa1e1e8bef376d600118cf3fd501c690a to pi-release
android-build-team Robot [Wed, 15 Nov 2017 08:30:38 +0000 (08:30 +0000)]
Snap for 4453288 from 5403b3eaa1e1e8bef376d600118cf3fd501c690a to pi-release

Change-Id: I8c01467ccefb731b9376fd40abd1664641c963c6