OSDN Git Service
android-build-team Robot [Sun, 29 Oct 2017 08:08:24 +0000 (08:08 +0000)]
Snap for
4422293 from
4c46fb1043906541a277035960c184289856202b to pi-release
Change-Id: I0fc5f271aaccb9c6a4b5de000db420c41e35f75a
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
Treehugger Robot [Fri, 27 Oct 2017 23:04:36 +0000 (23:04 +0000)]
Merge "Sending 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:
37782683,
65653485
Change-Id: I6627c8a12e096b9ac8ebe08e734782cfa951c488
android-build-team Robot [Wed, 18 Oct 2017 08:13:11 +0000 (08:13 +0000)]
Snap for
4402171 from
8ef33c439eea158fdcb573cc519c1d8538546142 to pi-release
Change-Id: Ieb9e351fda3199f09440677262ec3ab710468b84
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
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
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
Jim Kaye [Wed, 18 Oct 2017 01:06:59 +0000 (01:06 +0000)]
Merge "Fix VTS HAL Radio tests"
am:
4af7529e39
Change-Id: I6204d090a9d4b527eee00e5ed76ec15cb4769176
Treehugger Robot [Wed, 18 Oct 2017 00:57:34 +0000 (00:57 +0000)]
Merge "Fix 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
android-build-team Robot [Tue, 10 Oct 2017 08:11:29 +0000 (08:11 +0000)]
Snap for
4386413 from
484b05c883beca8b54fb66e06484a77755a207bd to pi-release
Change-Id: I5155c159622ebf76fd9e7fb0a071aace58566d9f
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
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
Pankaj Kanwar [Mon, 9 Oct 2017 23:58:15 +0000 (23:58 +0000)]
Merge "Fix rild crash" am:
3e8f2c80f4
am:
398177045e
Change-Id: Ib7b44b87ef125c9453bde30e90bbfdf88d48105c
Pankaj Kanwar [Mon, 9 Oct 2017 23:56:17 +0000 (23:56 +0000)]
Merge "Fix rild crash"
am:
3e8f2c80f4
Change-Id: Ic5cce3964d5d0a9282b39d81b416bc9a67afd4ea
Pankaj Kanwar [Mon, 9 Oct 2017 23:50:58 +0000 (23:50 +0000)]
Merge "Fix rild crash"
android-build-team Robot [Fri, 6 Oct 2017 08:13:54 +0000 (08:13 +0000)]
Snap for
4380820 from
072d10dc3fd84f83c0bec1c4b3102c56eea13089 to pi-release
Change-Id: I6476e2d0110462b2ba8df1d6aacbe086e54fb588
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
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
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
bohu [Wed, 4 Oct 2017 20:45:31 +0000 (20:45 +0000)]
Merge "reference-ril: fix emulator gateway"
am:
a66fd94317
Change-Id: I0d2dd97cf0bd96d4d1a25d51265599c97108fea7
Treehugger Robot [Wed, 4 Oct 2017 20:28:52 +0000 (20:28 +0000)]
Merge "reference-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
android-build-team Robot [Tue, 3 Oct 2017 08:10:44 +0000 (08:10 +0000)]
Snap for
4373608 from
d9caac1ea219cc21d5b22a8a6dfa8410f280890a to pi-release
Change-Id: I7bb0b497f4f3c7d5eea7025f69a06ba702cedad4
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
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
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
nharold [Fri, 15 Sep 2017 00:58:02 +0000 (00:58 +0000)]
Merge "Fix docstrings for RIL_CellIdentity"
am:
9fbd65c441
Change-Id: Ic4b83ab811bb645c83a7a24530b5fe4a599b2f1e
nharold [Thu, 14 Sep 2017 23:47:45 +0000 (23:47 +0000)]
Merge "Fix docstrings for RIL_CellIdentity"
android-build-team Robot [Thu, 14 Sep 2017 08:07:23 +0000 (08:07 +0000)]
release-request-
b06579bd-a905-4db5-ada9-
c69d40f4df90-for-git_pi-release-
4335309 snap-temp-L62700000102430107
Change-Id: Ifc8e1330f610cb88597ca52c422c6268a007a76c
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
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
Shuo Qian [Wed, 13 Sep 2017 23:08:12 +0000 (23:08 +0000)]
Merge "Fix Sap Service" am:
35629b94bd
am:
169d02b508
Change-Id: I7d56aaaeb77316141a475a6be3cc954c4013ff5a
Shuo Qian [Wed, 13 Sep 2017 22:43:55 +0000 (22:43 +0000)]
Merge "Fix Sap Service"
am:
35629b94bd
Change-Id: I87110a6484f9713c71dff1e8a2581b3a9d15de51
Shuo Qian [Wed, 13 Sep 2017 20:12:57 +0000 (20:12 +0000)]
Merge "Fix Sap Service"
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
Nathan Harold [Wed, 13 Sep 2017 19:43:20 +0000 (19:43 +0000)]
Fix docstrings for RIL_CellIdentity
am:
ae339b3feb
Change-Id: Ib216d068ab39f9eb0c7f4841a26eba7d8bca918c
Ajay Nambi [Tue, 5 Sep 2017 09:36:22 +0000 (15:06 +0530)]
Fix rild crash
Initialize ussInfo in getCurrentCallsResponse.
Bug:
65396967
Change-Id: I585176ccad494a648bd6869d5adbef583659c321
Nathan Harold [Tue, 29 Aug 2017 23:59:03 +0000 (16:59 -0700)]
Fix docstrings for RIL_CellIdentity
Update the documentation to match the current
CTS requirements for Cell Identity reporting
-For LTE, WCDMA, and GSM require that the channel
number be reported.
-For LTE and WCDMA, require that the correct
physical channel identifier be reported. Note that
due to b/
32774471 we still cannot require BSIC
to be reported.
Bug:
65174915
Test: none, comment-only change
Change-Id: I6866e3e78678aeb2b8f48bff032709f802cba067
Merged-In: I6866e3e78678aeb2b8f48bff032709f802cba067
(cherry picked from commit
ae339b3feb9d10c24a35db9c6ad01df5deeab1e0)
Nathan Harold [Tue, 29 Aug 2017 23:59:03 +0000 (16:59 -0700)]
Fix docstrings for RIL_CellIdentity
Update the documentation to match the current
CTS requirements for Cell Identity reporting
-For LTE, WCDMA, and GSM require that the channel
number be reported.
-For LTE and WCDMA, require that the correct
physical channel identifier be reported. Note that
due to b/
32774471 we still cannot require BSIC
to be reported.
Bug:
65174915
Test: none, comment-only change
Change-Id: I6866e3e78678aeb2b8f48bff032709f802cba067
android-build-team Robot [Thu, 7 Sep 2017 08:10:56 +0000 (08:10 +0000)]
release-request-
51e6d4a7-52eb-462d-9bf2-
f148ba83e4bd-for-git_pi-release-
4320962 snap-temp-L22700000100184372
Change-Id: I48a3e765f9c20ee9e2cebe63b0a7fcea62c21dce
Pengquan Meng [Thu, 7 Sep 2017 02:24:35 +0000 (02:24 +0000)]
Merge "Remove unused code" am:
fad0863829 am:
4901342696 am:
4cfe8829aa
am:
3e5c5566fb
Change-Id: I20be62dea628484c3a67e298723ce23dd6bb24fb
Pengquan Meng [Thu, 7 Sep 2017 02:15:45 +0000 (02:15 +0000)]
Merge "Remove unused code" am:
fad0863829 am:
4901342696
am:
4cfe8829aa
Change-Id: I37e23139642be493befcd45dcc8043031c5623cc
Pengquan Meng [Thu, 7 Sep 2017 02:08:04 +0000 (02:08 +0000)]
Merge "Remove unused code" am:
fad0863829
am:
4901342696
Change-Id: Ib5478645aa61706b6542196ada9797ad6ff10402
Pengquan Meng [Thu, 7 Sep 2017 02:03:34 +0000 (02:03 +0000)]
Merge "Remove unused code"
am:
fad0863829
Change-Id: Iee48190c8d07d38e51f45601d93922f8d18d72c9
Treehugger Robot [Thu, 7 Sep 2017 01:54:39 +0000 (01:54 +0000)]
Merge "Remove unused code"
Pengquan Meng [Wed, 6 Sep 2017 23:46:30 +0000 (16:46 -0700)]
Remove unused code
Bug:
62249769
Test: manually
Change-Id: Ibeae8537ee87dc9c3481538df0fcdb4f3d50f50c
Srikanth Chintala [Wed, 6 Sep 2017 22:51:11 +0000 (22:51 +0000)]
Merge "Remove memory overlap when updating rild variable" am:
0f9b43ef2d am:
36462a0ea0 am:
47b51140ac
am:
862a316e00
Change-Id: If49b95a17e3a358d2d7b3a0435ef4ebdf862d3be
Yifan Hong [Wed, 6 Sep 2017 22:50:49 +0000 (22:50 +0000)]
Merge "Remove unused include" am:
e03fd39e6b am:
03291f5e7e am:
a76bfdd142 -s ours
am:
b2d71e68cf -s ours
Change-Id: I7224cdd13e4c41878a24d0ea59f7f588be43a580
Srikanth Chintala [Wed, 6 Sep 2017 22:12:17 +0000 (22:12 +0000)]
Merge "Remove memory overlap when updating rild variable" am:
0f9b43ef2d am:
36462a0ea0
am:
47b51140ac
Change-Id: I57d1fd0c097e3f6de3170e4344a95bc6cd943fc9
Srikanth Chintala [Wed, 6 Sep 2017 22:08:17 +0000 (22:08 +0000)]
Merge "Remove memory overlap when updating rild variable" am:
0f9b43ef2d
am:
36462a0ea0
Change-Id: I1542895173774e13a10eed3093571c730709d43b
Srikanth Chintala [Wed, 6 Sep 2017 22:04:18 +0000 (22:04 +0000)]
Merge "Remove memory overlap when updating rild variable"
am:
0f9b43ef2d
Change-Id: Ic521151174cc468a9b3d434c16eb6598f29888aa
Treehugger Robot [Wed, 6 Sep 2017 21:56:08 +0000 (21:56 +0000)]
Merge "Remove memory overlap when updating rild variable"
Yifan Hong [Wed, 6 Sep 2017 19:40:15 +0000 (19:40 +0000)]
Merge "Remove unused include" am:
e03fd39e6b am:
03291f5e7e
am:
a76bfdd142 -s ours
Change-Id: Ie34abf653962456ec2e469f61714c65c83853f81
Yifan Hong [Wed, 6 Sep 2017 19:15:05 +0000 (19:15 +0000)]
Merge "Remove unused include" am:
e03fd39e6b
am:
03291f5e7e
Change-Id: I95760d87f56f2d7bae903be30fc8a65209ca0a59
Yifan Hong [Wed, 6 Sep 2017 19:02:04 +0000 (19:02 +0000)]
Merge "Remove unused include"
am:
e03fd39e6b
Change-Id: If0894bc4045add50d5bbdfbd49e442791a9fb2e0
Treehugger Robot [Wed, 6 Sep 2017 18:50:56 +0000 (18:50 +0000)]
Merge "Remove unused include"
Yifan Hong [Tue, 25 Jul 2017 22:41:00 +0000 (15:41 -0700)]
Remove unused include
Test: pass
Bug:
63135587
Merged-In: I541d3bbcc07d2c09f68e84fbdc91df2bce3e9d44
Change-Id: I541d3bbcc07d2c09f68e84fbdc91df2bce3e9d44
sqian [Wed, 6 Sep 2017 16:17:50 +0000 (16:17 +0000)]
Fix Sap Service am:
2075d7c513
am:
06be9a8f9e
Change-Id: I4fa22dccbcf9cc875501b5d0ed8f48f1a24dca92
sqian [Wed, 6 Sep 2017 16:09:48 +0000 (16:09 +0000)]
Fix Sap Service
am:
2075d7c513
Change-Id: I14c97627db7048c9b83fa2932791bb1c99d97763
sqian [Tue, 5 Sep 2017 18:51:45 +0000 (11:51 -0700)]
Fix Sap Service
Because sapDecodeMessage can return NULL in its code logic, to check NULL
before its usage in processResponse might be necessary.
Bug:
65028505
Test: fuzzer
Change-Id: I27ee6ef99c495e29408c3c0d895cb8ee54d54173
Merged-In: I27ee6ef99c495e29408c3c0d895cb8ee54d54173
sqian [Tue, 5 Sep 2017 18:51:45 +0000 (11:51 -0700)]
Fix Sap Service
Because sapDecodeMessage can return NULL in its code logic, to check NULL
before its usage in processResponse might be necessary.
Bug:
65028505
Test: fuzzer
Change-Id: I27ee6ef99c495e29408c3c0d895cb8ee54d54173
android-build-team Robot [Wed, 30 Aug 2017 08:06:14 +0000 (08:06 +0000)]
release-request-
dbb5053c-c8af-4c07-a295-
d7d7b281ce3f-for-git_pi-release-
4306414 snap-temp-L16000000097876522
Change-Id: I2bc70b9562c43760828aa1c5e7957ecf364764bc
Jim Kaye [Wed, 16 Aug 2017 18:32:32 +0000 (11:32 -0700)]
Distingush SIM NOT_READY from ABSENT when radio is off
The old code reported the SIM status as NOT_READY if the radio
state was OFF or UNAVAILABLE.
Some VTS tests fail if the reported status is NOT_READY when the
test expects ABSENT. If the radio state is not ON, try to get more
SIM status and report a more precise result.
Bug:
62137708
Test: VtsHalRadioV1_0Target no longer reports "expected 0 (ABSENT), got 1"
Change-Id: Id6a67e67ef04b23f09e52b831f7946180cfc4d06
(cherry picked from commit
0adc0307a734fad9d701188fa862cbd6ac8e3204)
Amit Mahajan [Tue, 22 Aug 2017 20:18:40 +0000 (20:18 +0000)]
Merge "Better handling for hal version 1.1" am:
365e630c77 am:
38954e0330 am:
b58815e545 am:
b1bcb3ce50
am:
dd342d087c
Change-Id: I6e2ce2bf979cd5803cb42342d9672f659925b514
Amit Mahajan [Tue, 22 Aug 2017 20:01:40 +0000 (20:01 +0000)]
Merge "Better handling for hal version 1.1" am:
365e630c77 am:
38954e0330 am:
b58815e545
am:
b1bcb3ce50
Change-Id: I89587d5c19bc47b41870c69336507e0bf331eec3
Amit Mahajan [Tue, 22 Aug 2017 19:56:11 +0000 (19:56 +0000)]
Merge "Better handling for hal version 1.1" am:
365e630c77 am:
38954e0330
am:
b58815e545
Change-Id: I6825d44d10a8dcac70bedd67db89863823dafb2c
Amit Mahajan [Tue, 22 Aug 2017 19:50:38 +0000 (19:50 +0000)]
Merge "Better handling for hal version 1.1" am:
365e630c77
am:
38954e0330
Change-Id: If8338a85499f8da5bcecd0bff3aa31a4cabff936
Amit Mahajan [Tue, 22 Aug 2017 19:45:09 +0000 (19:45 +0000)]
Merge "Better handling for hal version 1.1"
am:
365e630c77
Change-Id: I866cf81013d9b90e567d84b7def7f1750834ff39
Treehugger Robot [Tue, 22 Aug 2017 19:35:09 +0000 (19:35 +0000)]
Merge "Better handling for hal version 1.1"
Amit Mahajan [Fri, 9 Jun 2017 17:44:54 +0000 (10:44 -0700)]
Better handling for hal version 1.1
Test: Basic telephony sanity
Bug:
62459058
Change-Id: I451d8e1c8cd07ce8a05d44e0e27cc30eab6bf7db
Shuo Qian [Wed, 16 Aug 2017 02:06:22 +0000 (02:06 +0000)]
Merge "Change mapping of QMI error" am:
5e3275d44e am:
48004a7491 am:
382c3333a2 -s ours am:
c2bddd8443 -s ours
am:
45be5716ec -s ours
Change-Id: Idfaed931d881e061da6fe05f0907ddfb1799c12f
Shuo Qian [Wed, 16 Aug 2017 01:49:07 +0000 (01:49 +0000)]
Merge "Change mapping of QMI error" am:
5e3275d44e am:
48004a7491 am:
382c3333a2 -s ours
am:
c2bddd8443 -s ours
Change-Id: I4682982aa90ebc103f9157b98db7636fcff5b36f
Shuo Qian [Wed, 16 Aug 2017 00:57:10 +0000 (00:57 +0000)]
Merge "Change mapping of QMI error" am:
5e3275d44e am:
48004a7491
am:
382c3333a2 -s ours
Change-Id: I443a63132f09a1683ca1259adfa1833eac6708bb
Shuo Qian [Wed, 16 Aug 2017 00:45:49 +0000 (00:45 +0000)]
Merge "Change mapping of QMI error" am:
5e3275d44e
am:
48004a7491
Change-Id: Ia75a6ef4928204e3331407ca9eee951e6b0f98c5
Shuo Qian [Wed, 16 Aug 2017 00:36:08 +0000 (00:36 +0000)]
Merge "Change mapping of QMI error"
am:
5e3275d44e
Change-Id: I44f62dc958d548ce5d77a81ee31e919db060539d
Shuo Qian [Wed, 16 Aug 2017 00:25:21 +0000 (00:25 +0000)]
Merge "Change mapping of QMI error"
sqian [Tue, 15 Aug 2017 23:13:41 +0000 (16:13 -0700)]
Change mapping of QMI error
Change mapping of QMI_ERR_OP_NETWORK_UNSUPPORTED
from MODE_NOT_SUPPORTED to OPERATION_NOT_ALLOWED.
Test: run vts
Bug:
62584347
Change-Id: Ie3fcb82a3a90c8a609fce45f35ef22f1cf21b222
Merged-In: Ie3fcb82a3a90c8a609fce45f35ef22f1cf21b222
(cherry picked from commit
1d3f44876d5aa6de89f532fc4d53e6351ae5d169)
sqian [Tue, 15 Aug 2017 19:37:32 +0000 (19:37 +0000)]
resolve merge conflicts of
3ceaacc to stage-aosp-master am:
04b63e5ab2 am:
396aadae6f -s ours am:
a748e8e17e -s ours
am:
f6b2c113df -s ours
Change-Id: If4b1c00455d67447919f9cc097dad24457eae503
sqian [Tue, 15 Aug 2017 19:07:36 +0000 (19:07 +0000)]
resolve merge conflicts of
3ceaacc to stage-aosp-master am:
04b63e5ab2 am:
396aadae6f -s ours
am:
a748e8e17e -s ours
Change-Id: I588dbb17c9c8af53aa26419f64f4c9e17e567305
sqian [Tue, 15 Aug 2017 19:02:38 +0000 (19:02 +0000)]
resolve merge conflicts of
3ceaacc to stage-aosp-master am:
04b63e5ab2
am:
396aadae6f -s ours
Change-Id: I89f137a2a1de1e66453e3cfd664cdfc717eb7887
sqian [Tue, 15 Aug 2017 18:57:43 +0000 (18:57 +0000)]
resolve merge conflicts of
3ceaacc to stage-aosp-master
am:
04b63e5ab2
Change-Id: I7aea40b2e4ff87aef854b40c09fb9d4cbae13165
sqian [Mon, 14 Aug 2017 23:31:07 +0000 (16:31 -0700)]
resolve merge conflicts of
3ceaacc to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic688982b8d16a7d42cafdf0d76eb6ec931322b1e
Shuo Qian [Mon, 14 Aug 2017 23:09:07 +0000 (23:09 +0000)]
Merge "Update ril.h documentation for vts"
sqian [Fri, 11 Aug 2017 18:40:25 +0000 (11:40 -0700)]
Update ril.h documentation for vts
Update ril.h documentation for errors found by VTS
copy of https://partner-android-review.googlesource.com/#/c/836670/
+ extra update for some missed error code
+ request_not_supported
Bug:
35671595
Test: Manual
Change-Id: Ib444c357830ff4533716dfe12c1189fd32715da9
Merged-In: Ib444c357830ff4533716dfe12c1189fd32715da9
(cherry picked from commit
a216ed40b16c856bdb4bf0670ac9ed39e06235c3)
Sanket Padawe [Thu, 10 Aug 2017 05:24:07 +0000 (05:24 +0000)]
Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into nyc-dev am:
f0cbbbcdac am:
ab379831bc am:
a5eeaef8ee am:
6c6d404fb5 am:
96582369cb -s ours am:
7421b551d3 am:
49139f9cdd am:
3b543e3c2f
am:
c61088583f -s ours
Change-Id: I1bc6fcc2178c883305ac984d510134f65ee401ab
Sanket Padawe [Thu, 10 Aug 2017 05:23:57 +0000 (05:23 +0000)]
Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into mnc-dev am:
e66a47c150 am:
957626f82d am:
ddc6f6427e am:
0756964d91 -s ours am:
b8484b0fe3 am:
e9fe8f02c9 am:
71eb7902d3 am:
77142523ff am:
009637231d -s ours am:
a50308d10b am:
05465f92be am:
44fa7c92a8
am:
1210426576 -s ours
Change-Id: I11a74ac4b7953746f6b64937548c9f2daaece58e
Sanket Padawe [Thu, 10 Aug 2017 05:23:48 +0000 (05:23 +0000)]
Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into nyc-dev am:
f0cbbbcdac am:
ab379831bc am:
a5eeaef8ee am:
6c6d404fb5 am:
96582369cb -s ours am:
7421b551d3 am:
b6daf50700 am:
8c1ffbf547
am:
8e0c72b952 -s ours
Change-Id: I304dca8ff4e146bda4ee77c23a228492d7b90438
Sanket Padawe [Thu, 10 Aug 2017 05:23:39 +0000 (05:23 +0000)]
Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into mnc-dev am:
e66a47c150 am:
957626f82d am:
ddc6f6427e am:
0756964d91 -s ours am:
b8484b0fe3 am:
e9fe8f02c9 am:
71eb7902d3 am:
77142523ff am:
009637231d -s ours am:
a50308d10b am:
14e2eebe88 am:
162436785f
am:
802f7ecf91 -s ours
Change-Id: Iaab91d84a1b465bc06d90201ca5bcadf25d30a89
Sanket Padawe [Thu, 10 Aug 2017 05:23:29 +0000 (05:23 +0000)]
Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into nyc-dev am:
f0cbbbcdac am:
ab379831bc am:
a5eeaef8ee am:
6c6d404fb5 am:
96582369cb -s ours am:
7421b551d3 am:
b6daf50700 am:
c4a73f3899
am:
8d7989c455 -s ours
Change-Id: I62003e6d0d70750f55da53a969ea6c1e0ee63fb1
Sanket Padawe [Thu, 10 Aug 2017 05:23:19 +0000 (05:23 +0000)]
Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into mnc-dev am:
e66a47c150 am:
957626f82d am:
ddc6f6427e am:
0756964d91 -s ours am:
b8484b0fe3 am:
e9fe8f02c9 am:
71eb7902d3 am:
77142523ff am:
009637231d -s ours am:
a50308d10b am:
14e2eebe88 am:
b78a97b1a2
am:
1f33db2233 -s ours
Change-Id: Id94bbdce92fdd1c4ba7adf81b34a21a063742d1d
Sanket Padawe [Thu, 10 Aug 2017 05:16:27 +0000 (05:16 +0000)]
Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into nyc-dev am:
f0cbbbcdac am:
ab379831bc am:
a5eeaef8ee am:
6c6d404fb5 am:
96582369cb -s ours am:
7421b551d3 am:
49139f9cdd
am:
3b543e3c2f
Change-Id: I36288af8d2b48ddc901e10adad44cb7f302abff8
Sanket Padawe [Thu, 10 Aug 2017 05:16:18 +0000 (05:16 +0000)]
Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into mnc-dev am:
e66a47c150 am:
957626f82d am:
ddc6f6427e am:
0756964d91 -s ours am:
b8484b0fe3 am:
e9fe8f02c9 am:
71eb7902d3 am:
77142523ff am:
009637231d -s ours am:
a50308d10b am:
05465f92be
am:
44fa7c92a8
Change-Id: Id671606a1905d96fd1358468fd624c3739fb5377
Sanket Padawe [Thu, 10 Aug 2017 05:16:06 +0000 (05:16 +0000)]
Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into nyc-dev am:
f0cbbbcdac am:
ab379831bc am:
a5eeaef8ee am:
6c6d404fb5 am:
96582369cb -s ours am:
7421b551d3 am:
b6daf50700
am:
8c1ffbf547
Change-Id: Iaf5fab2c9fb6678b2bbf88693069dc02310c258c
Sanket Padawe [Thu, 10 Aug 2017 05:15:56 +0000 (05:15 +0000)]
Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into mnc-dev am:
e66a47c150 am:
957626f82d am:
ddc6f6427e am:
0756964d91 -s ours am:
b8484b0fe3 am:
e9fe8f02c9 am:
71eb7902d3 am:
77142523ff am:
009637231d -s ours am:
a50308d10b am:
14e2eebe88
am:
162436785f
Change-Id: I4b71a983221054b8284e14ca3165dc1ca4d8aa31
Sanket Padawe [Thu, 10 Aug 2017 05:15:01 +0000 (05:15 +0000)]
Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into nyc-dev am:
f0cbbbcdac am:
ab379831bc am:
a5eeaef8ee am:
6c6d404fb5 am:
96582369cb -s ours am:
7421b551d3 am:
b6daf50700
am:
c4a73f3899
Change-Id: If5637a233bf65f5ffe3c0e6894dbe56e3a79634e
Sanket Padawe [Thu, 10 Aug 2017 05:14:50 +0000 (05:14 +0000)]
Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into mnc-dev am:
e66a47c150 am:
957626f82d am:
ddc6f6427e am:
0756964d91 -s ours am:
b8484b0fe3 am:
e9fe8f02c9 am:
71eb7902d3 am:
77142523ff am:
009637231d -s ours am:
a50308d10b am:
14e2eebe88
am:
b78a97b1a2
Change-Id: I6fa363d29782194b059182e234b75d8b6b102302
OSDN Git Service
