OSDN Git Service
Nathan Harold [Thu, 4 Oct 2018 23:25:52 +0000 (16:25 -0700)]
[automerger skipped] Encode the Number of MNC Digits in CellIdentity
am:
5f438e18ba -s ours
Change-Id: I556c587b6f704da03f426a24fd8fda210d95f203
Nathan Harold [Mon, 20 Aug 2018 18:38:27 +0000 (11:38 -0700)]
Encode the Number of MNC Digits in CellIdentity
Legacy RIL uses an integer to encode the number of
MNC digits. Because the size is not fixed, leading
zeroes result in ambiguity in the length of the mnc.
This change adds support for passing the number of
encoded digits in the most-significant nibble of the
mnc integer (which is only 10 bits). Thus, on any
implementation that is 16-bits or wider, the mnc info
will be properly encoded and decoded with the
correctly-sized string.
Bug:
111971808
Test: ril::util::mnc::test
Change-Id: I24aeba5328a63f80b0d6b25b068bd19160191dff
Merged-In: I24aeba5328a63f80b0d6b25b068bd19160191dff
(cherry picked from commit
98cfceefdf06d5e4ec3bfff3d1cd425baefb155e)
Nathan Harold [Thu, 30 Aug 2018 22:56:35 +0000 (15:56 -0700)]
Merge "Encode the Number of MNC Digits in CellIdentity" am:
1fba551f96
am:
e983fcbd19
Change-Id: I59c8038e6c431a3b7605c269478d1aece4157cb8
Nathan Harold [Thu, 30 Aug 2018 22:36:24 +0000 (15:36 -0700)]
Merge "Encode the Number of MNC Digits in CellIdentity"
am:
1fba551f96
Change-Id: If70db22040cbf72f0e26402c5816f39af785b91d
Treehugger Robot [Thu, 30 Aug 2018 22:14:35 +0000 (22:14 +0000)]
Merge "Encode the Number of MNC Digits in CellIdentity"
Nathan Harold [Mon, 20 Aug 2018 18:38:27 +0000 (11:38 -0700)]
Encode the Number of MNC Digits in CellIdentity
Legacy RIL uses an integer to encode the number of
MNC digits. Because the size is not fixed, leading
zeroes result in ambiguity in the length of the mnc.
This change adds support for passing the number of
encoded digits in the most-significant nibble of the
mnc integer (which is only 10 bits). Thus, on any
implementation that is 16-bits or wider, the mnc info
will be properly encoded and decoded with the
correctly-sized string.
Bug:
111971808
Test: ril::util::mnc::test
Change-Id: I24aeba5328a63f80b0d6b25b068bd19160191dff
Xin Li [Wed, 8 Aug 2018 05:17:05 +0000 (22:17 -0700)]
Merge "Merge Android Pie into master" am:
c136355b05 am:
e4be21cdac
am:
d1b5e6e6ea
Change-Id: Ia0aaad82f89939d1eb3985852c87b10f3eeaf3dd
Xin Li [Wed, 8 Aug 2018 01:06:47 +0000 (18:06 -0700)]
Merge "Merge Android Pie into master" am:
c136355b05
am:
e4be21cdac
Change-Id: I87a78c5461d42a3c663b13fd0a29f9b5b1db4792
Xin Li [Tue, 7 Aug 2018 21:33:44 +0000 (14:33 -0700)]
Merge "Merge Android Pie into master"
am:
c136355b05
Change-Id: If0ba079474b2988e94ac8148a02dc54c87eb25b7
Xin Li [Tue, 7 Aug 2018 16:51:27 +0000 (16:51 +0000)]
Merge "Merge Android Pie into master"
Xin Li [Mon, 6 Aug 2018 23:51:13 +0000 (16:51 -0700)]
Merge Android Pie into master
Bug:
112104996
Change-Id: I057be85a9c61eba0f6624bd3165e59163a8fc4bc
Xin Li [Sat, 9 Jun 2018 09:50:39 +0000 (02:50 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am:
f43ad9ed5a
Change-Id: I2f0db645814fc1582156ac0448890a6d42c6d20f
Xin Li [Fri, 8 Jun 2018 18:07:55 +0000 (11:07 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug:
79597307
Change-Id: I15c4264853cf6faf1a02d848ffa262ac22586963
Sooraj Sasindran [Fri, 11 May 2018 23:13:16 +0000 (16:13 -0700)]
Add scan error to Network Scan result
am:
982ba7ab07
Change-Id: If5c231a10ec9c7697c9ad6bb31a9c7349a5606c2
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
terrycrhuang [Fri, 4 May 2018 19:08:58 +0000 (12:08 -0700)]
ril: Change rild initial sequence to guarantee non-null function pointer before rild register its hidl service
am:
456df1bf43
Change-Id: I22ef08409bfcdbb052859f4aaada1f5f04a858c8
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
Steven Moreland [Tue, 27 Mar 2018 04:46:37 +0000 (04:46 +0000)]
Merge "Add DISABLE_RILD_OEM_HOOK." into pi-dev
am:
ac71c57c88
Change-Id: I490e1d14b7575ba8628243db67f63912dd35c24e
TreeHugger Robot [Tue, 27 Mar 2018 04:35:16 +0000 (04:35 +0000)]
Merge "Add DISABLE_RILD_OEM_HOOK." into pi-dev
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
bohu [Wed, 21 Mar 2018 01:17:09 +0000 (01:17 +0000)]
reference-ril: fix asan error
am:
4818c04ca3
Change-Id: I65ee0a1af205c67ba57aeecda4e9cf968b3b51a7
bohu [Mon, 19 Mar 2018 22:49:39 +0000 (15:49 -0700)]
reference-ril: fix asan error
BUG:
74981776
Change-Id: I9e321fd6b34fe2a37a5e22668f7070f6da7d9f46
Bo Hu [Fri, 16 Mar 2018 21:46:28 +0000 (21:46 +0000)]
Revert "Emulator: add CSIM authentication support"
am:
0c6d743856
Change-Id: I579b1a1f3b54eb50d1e9d65e308e395eaa5580b1
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
bohu [Fri, 16 Mar 2018 01:43:45 +0000 (01:43 +0000)]
Emulator: add CSIM authentication support
am:
1a0999f535
Change-Id: I3531c0e7997084e721b54fd1b1cf5ad13fd0e4ea
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>
bohu [Tue, 13 Mar 2018 17:04:44 +0000 (17:04 +0000)]
Emulator: use RIL_CellInfo_v12
am:
2d9f8af0f6
Change-Id: Ibddafd96ca06dc5a992a079a3df04133c783da2d
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
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>
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>
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
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
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
Treehugger Robot [Mon, 12 Mar 2018 20:35:37 +0000 (20:35 +0000)]
Merge "libril: Protect against NULL unsolicited response function"
bohu [Sat, 10 Mar 2018 06:40:35 +0000 (06:40 +0000)]
Emulator: support querying device identity
am:
efa3401c71
Change-Id: I30c1a653b9f927a6b4f4b750eb4125555d1a11d4
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>
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
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
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>
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)
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
TreeHugger Robot [Thu, 8 Mar 2018 01:02:28 +0000 (01:02 +0000)]
Merge "Enable/disable radio interface on setup/deactivate" into pi-dev
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>
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
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
TreeHugger Robot [Tue, 6 Mar 2018 22:50:46 +0000 (22:50 +0000)]
Merge "reference-ril: add owner from emulator team" into pi-dev
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)
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)
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
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
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
Treehugger Robot [Thu, 1 Mar 2018 01:02:28 +0000 (01:02 +0000)]
Merge "Store 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
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>
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
Jack Yu [Mon, 12 Feb 2018 23:08:53 +0000 (23:08 +0000)]
Merge "Changed owners" am:
72ee094c8d
am:
7c0ce9e778
Change-Id: I977114eac84d377a16522c93f77c617577600f9d
Jack Yu [Mon, 12 Feb 2018 23:02:02 +0000 (23:02 +0000)]
Merge "Changed owners"
am:
72ee094c8d
Change-Id: Ic84d14a9584d938bc92cc9ceb6bfb3d3044cff3b
Jack Yu [Mon, 12 Feb 2018 22:37:54 +0000 (22:37 +0000)]
Merge "Changed owners"
Jack Yu [Mon, 12 Feb 2018 19:52:36 +0000 (11:52 -0800)]
Changed owners
Test: Build
Change-Id: I1f647165958984380419bb5ca92b9fb141bf43e7
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
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
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
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
Tao Wu [Wed, 24 Jan 2018 05:41:01 +0000 (05:41 +0000)]
Merge "Revert "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
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
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
Elliott Hughes [Mon, 22 Jan 2018 21:26:51 +0000 (21:26 +0000)]
Merge "Avoid possible buffer overflow."
am:
5b6c4c4612
Change-Id: I3b952f06bed1713c451a24b76fb53c39c528d9bc
Treehugger Robot [Mon, 22 Jan 2018 20:56:54 +0000 (20:56 +0000)]
Merge "Avoid 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
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
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
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
Treehugger Robot [Tue, 19 Dec 2017 21:52:43 +0000 (21:52 +0000)]
Merge "Add carrierKeyLength parameter in RIL_CarrierInfoForImsiEncryption structure"
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
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
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
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
Jim Kaye [Tue, 12 Dec 2017 01:23:02 +0000 (01:23 +0000)]
Merge "Fix more VTS HAL Radio tests"
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
Stephen Li [Thu, 7 Dec 2017 23:32:18 +0000 (23:32 +0000)]
Manually merge changes from giant AOSP topic
Change-Id: I6fefa3e010a11d438ea1867a5062d185b4682c27
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
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
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
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
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
Xin Li [Wed, 6 Dec 2017 23:18:26 +0000 (23:18 +0000)]
Merge "DO 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
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
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
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
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
Treehugger Robot [Mon, 20 Nov 2017 20:21:01 +0000 (20:21 +0000)]
Merge "Use -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
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
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
Xin Li [Mon, 13 Nov 2017 22:35:41 +0000 (14:35 -0800)]
Merge commit '
d0eaef9aaf46fe3e8a54eeb81601200fe39ab07d' into HEAD
Change-Id: I1810fcc6011e0de8e8d053f2cc52d3527d0b6be6
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
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
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
OSDN Git Service
