Commit graph

143 commits

Author SHA1 Message Date
Xin Li
36dcf1a404 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I6502829205ede2de914b27e6c2c5c42916af2b39
Change-Id: I7cb06511e43bd1fffd5f80a11dbdf5b1314cfe8e
2020-08-28 13:05:04 -07:00
Sarah Chin
44fde6386b Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for
reference

Test: build
Bug: 161896447
Change-Id: I3c0d02e1ee94c575c3a18291d438b464d7396463
Merged-In: I3c0d02e1ee94c575c3a18291d438b464d7396463
2020-07-30 21:24:53 +00:00
Dan Shi
ba4d532fee Suppress gtest error for tests without any instance
Bug: 162052785
Test: m -j vts
Change-Id: I8c1a48e6fbd7c8161137902b5332911fa0d7b8b3
2020-07-28 15:12:32 -07:00
Jooyung Han
d610435ac4 update hidl .bp
HIDL libs are not necessarily part of VNDK now. Because some are
used by VNDK libs, they are still VNDK. But rest are now just
vendor-available.

.hidl_for_test files are also removed because they are used to exclude
test-purpose hidl libs from VNDK libs.

Instead, .hidl_for_system_ext files are added to tests/lazy to
distinguish them from others which are installed /system.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
Change-Id: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
(cherry picked from commit b0907a6bb8)
2020-07-07 16:22:36 +09:00
Jooyung Han
d18cba85fe update hidl .bp
HIDL libs are not necessarily part of VNDK now. Because some are
used by VNDK libs, they are still VNDK. But rest are now just
vendor-available.

.hidl_for_test files are also removed because they are used to exclude
test-purpose hidl libs from VNDK libs.

Instead, .hidl_for_system_ext files are added to tests/lazy to
distinguish them from others which are installed /system.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
Change-Id: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
(cherry picked from commit b0907a6bb8)
2020-07-02 12:26:37 +09:00
Jordan Liu
efab6b568f Override gtest timeout and add logging
Note that this just increases the gtest time to match our
highest wait times. Each test still has wait times fitted for the
expected length of that test.

Bug: 159289514
Test: atest VtsHalRadioV1_0TargetTest
Change-Id: I0825305258bae20ea6e13e9b9a65ce30b7153611
Merged-In: I0825305258bae20ea6e13e9b9a65ce30b7153611
2020-06-29 11:43:00 -07:00
Jordan Liu
fffbdfa1eb Override gtest timeout and add logging
Note that this just increases the gtest time to match our
highest wait times. Each test still has wait times fitted for the
expected length of that test.

Bug: 159289514
Test: atest VtsHalRadioV1_0TargetTest
Change-Id: I0825305258bae20ea6e13e9b9a65ce30b7153611
2020-06-26 22:51:58 +00:00
Steven Moreland
0b4b27183c Radio tests: root before multi-sim preparation.
These tests assumed that they were rooted before running, and due to
a combination of b/152655658 and b/154638140, these appeared to work
when a device already happened to be rooted and the test failures showed
up as problems with the test rather than as problems with the target
preparer.

This is the same workaround being used elsewhere.

Fixes: 154445273 # specifically about VtsHalSapV1_0TargetTest
Test: atest VtsHalSapV1_0TargetTest # passes 100%

The following tests, I confirm MultiSimTargetPreparer works, although my
test device has no SIM so I cannot get fully useful results.
Test: atest VtsHalRadioV1_0TargetTest # slot2 cases can now pass
Test: atest VtsHalRadioV1_1TargetTest # slot2 cases can now pass
Test: atest VtsHalRadioV1_2TargetTest # slot2 cases can now pass
Test: atest VtsHalRadioV1_3TargetTest # fully passes
Test: atest VtsHalRadioV1_4TargetTest # fully passes

Change-Id: Id62cb2e1b7a95552b560ab1d4ff2f63c0a7569a3
2020-05-06 14:17:05 -07:00
Dan Shi
aad51fa000 Rename vts-core to vts
Bug: 151896491
Test: local build
Exempt-From-Owner-Approval: This CL update suite name vts-core to vts as
the suite name is updated. This CL won't change test logic or behavior.

Change-Id: I562b4dc50765e953800a814a8fd84a01c1b9352b
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-04-07 16:37:40 -07:00
Dan Shi
ba894f81db Rename vts-core to vts
Bug: 151896491
Test: local build
Exempt-From-Owner-Approval: This CL update suite name vts-core to vts as
the suite name is updated. This CL won't change test logic or behavior.

Change-Id: I562b4dc50765e953800a814a8fd84a01c1b9352b
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-04-07 15:17:02 -07:00
Shuo Qian
fb98e4f092 Starting from Android 11, VTS will use "DISABLE_" prefix to disable tests instead of the .xml file. We need to migrate these things.
Test: Treehugger; GoogleTest knowledge; VTS team confirmation
Bug: 152813990
Change-Id: I92616557ae44c2a421ee687d0420f7b7901ba5a9
Merged-In: I92616557ae44c2a421ee687d0420f7b7901ba5a9
(cherry picked from commit 872ffc262f)
2020-04-01 04:39:47 +00:00
Shuo Qian
872ffc262f Starting from Android 11, VTS will use "DISABLE_" prefix to disable tests instead of the .xml file. We need to migrate these things.
Test: Treehugger; GoogleTest knowledge; VTS team confirmation
Bug: 152813990
Change-Id: I92616557ae44c2a421ee687d0420f7b7901ba5a9
2020-04-01 02:32:11 +00:00
Dan Shi
8caedd0d68 Convert VtsHalRadioV1_*TargetTest to be parameterized test
Bug: 142397658
Bug: 142972256
Test: atest VtsHalRadioV1_0TargetTest \
  VtsHalSapV1_0TargetTest \
  VtsHalRadioV1_1TargetTest \
  VtsHalRadioV1_2TargetTest \
  VtsHalRadioV1_3TargetTest \
  VtsHalRadioV1_4TargetTest

Change-Id: I1890f7a6b1401260e87c94c2bc4e1dfa7060a0cb
2019-11-22 13:57:26 -08:00
Nathan Harold
aad649b8df Merge "Fix RadioHidlTest_v1_2.startNetworkScan maxSearchTime"
am: 3c8f624724

Change-Id: If856c76531d329e7beac3d0b4902ecf46a7c8b6d
2019-10-09 19:38:49 -07:00
Nathan Harold
3c8f624724 Merge "Fix RadioHidlTest_v1_2.startNetworkScan maxSearchTime" 2019-10-10 02:18:48 +00:00
jun.wang
5341e17199 Fix RadioHidlTest_v1_2.startNetworkScan maxSearchTime
Add the initialization of the incrementalResultsPeriodicity and
maxSearchTime in the networkScan request.
The incrementalResultsPeriodicity and maxSearchTime are not
initialized in the networkScan request. So the default value is 0.
But the incrementalResultsPeriodicity and maxSearchTime
are required not to be 0 in subsequent tests.

CL ported from pag/1433565

Bug:140451434
Test: make vts && vts-tradefed run commandAndExit vts -m \
      VtsHalRadioV1_2Target -t RadioHidlTest_v1_2#startNetworkScan
Change-Id: I1b4e512a37d3d85ebc905a64987a40af801bce53
(cherry picked from commit f7894eb4d8c395add7c70a20520336057ae2656f)
2019-10-09 15:41:59 -07:00
Nathan Harold
696851b904 Merge "Clarify the start and end of scan intervals"
am: 111a10c44e

Change-Id: If37e587d604003ea2422938dfc994d2109ae359e
2019-10-01 14:06:26 -07:00
Nathan Harold
3b685a8ac8 Clarify the start and end of scan intervals
Update the documentation of NetworkScanRequest to clarify
that the interval between scans is from the completion of
one scan to the start of another. This is the only possible
definition that doesn't possibly result in back-to-back
scans which never complete.

In the initial design of this API, the stated use case was
for scans where "interval" >> "scan duration". For that
use case, this clarification doesn't make a meaningful
difference; however, for the use case of long-duration
scans, the distinction prevents the issue stated above.

Bug: 139935383
Test: compilation (docstring-only change)
Change-Id: Ib8393110bfd3ea883045648ee7dac9c6e6a32d44
2019-09-30 16:11:22 -07:00
Xin Li
15be13ea71 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: Ia07db5c8afeed7fe22a2b18d867a38390f910a81
Merged-In: Ibbd540dbb5baee46360d3fe9469212cfd8f550ba
2019-09-08 13:06:54 -07:00
Steven Moreland
b3a4d3832e Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I075670b64eebbbbd6a6ae0e84ad51bf1c6f5ba36
2019-09-06 01:07:02 +00:00
Xin Li
68464fb5a0 DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
Bug: 139893257
Change-Id: I7e48b5477b2edda72c940e05531782dd28a2f784
2019-08-23 06:45:16 +00:00
Youming Ye
f5d07b84c1 Add non-dds check for startNetworkScan
Providing non-dds exemption for HAL 1.2 network scan due to some devices
only perform network scan on preferred data sim. Since logical modem
id(0/1) and physical sim slot id(0/1) are intuitively aligned. Set
first sim as dds sim, and skip the network scan on the second one
(non-dds).

Test: Vts
Bug: 135243177
Change-Id: I58b89473714dc6d3ce6567ba1809baad6cd6d799
(cherry picked from commit fc85e8fa50)
2019-08-01 00:58:48 +00:00
Youming Ye
b9fc856440 Merge "Add non-dds check for startNetworkScan" into qt-dev am: 53861e16c3
am: 0639b1cc0d

Change-Id: If9ba81a2802a5539529c348b99b53d2f7876cc99
2019-07-22 17:35:57 -07:00
Youming Ye
53861e16c3 Merge "Add non-dds check for startNetworkScan" into qt-dev 2019-07-23 00:08:37 +00:00
Youming Ye
fc85e8fa50 Add non-dds check for startNetworkScan
Providing non-dds exemption for HAL 1.2 network scan due to some devices
only perform network scan on preferred data sim. Since logical modem
id(0/1) and physical sim slot id(0/1) are intuitively aligned. Set
first sim as dds sim, and skip the network scan on the second one
(non-dds).

Test: Vts
Bug: 135243177
Change-Id: I58b89473714dc6d3ce6567ba1809baad6cd6d799
2019-07-19 16:32:46 -07:00
Willy Hu
fb1616eb94 VTS: Change stopNetworkScan from 1_1 to 1_2
Change stopNetworkScan from 1_1 to 1_2 when testing VtsHalRadioV1_2Target.

Symptom:

When vts process slot2 "startnetworkscan", it will call "stopnetworkscan()" when startnetworkscan
success. But from current design it will set stopnetworkscan to slot1(wrong slot, expect is slot2)
as bwlow log.

CTS fail log:
hardware/interfaces/radio/1.2/vts/functional/radio_hidl_hal_test.cpp:111

//Device request NwScan on 2nd Sim
06-28 11:30:22.770 radio   873  1213 F RILQ    : RIL[1][Log.cpp: 48] [DispatcherModul(873,1213)]
d: [DispatcherModule]: Handling msg = RIL_REQUEST_START_NETWORK_SCAN

//But Device want to abort on Primary Sim
06-28 11:30:22.776 radio   923  1205 F RILQ    : RIL[0][Log.cpp: 48] [DispatcherModul(923,1205)]
d: [NasModule]: Handling msg = RIL_REQUEST_STOP_NETWORK_SCAN[Context: IRadio(1681692777)]

Bug: 135982495
Test: Build pass. Local test VTS pass.
Change-Id: Ic53c24ab2a670e806b4ac7f192e6eb81252ade84
(cherry picked from commit 5cef297cb2)
2019-07-11 18:53:58 +00:00
Felix
bf481c99ed Merge "Add interface info to .rc files" am: 98d0f4d52c am: 37298a7616
am: 3531ec0183

Change-Id: I9a48f01064e6b64fdbd3dcae3623163a27998703
2019-07-08 12:42:48 -07:00
Felix
37298a7616 Merge "Add interface info to .rc files"
am: 98d0f4d52c

Change-Id: Ie6cfbacd523c4b09f77bee3369ec8e88b3fa0419
2019-07-08 12:22:23 -07:00
Willy Hu
39c6e3a9e7 Merge "VTS: Change stopNetworkScan from 1_1 to 1_2" into qt-r1-dev
am: 1b1c6e42c9

Change-Id: I81d68cbcbe396ef50e224fc691acc568b0247670
2019-07-04 04:40:22 -07:00
Willy Hu
5cef297cb2 VTS: Change stopNetworkScan from 1_1 to 1_2
Change stopNetworkScan from 1_1 to 1_2 when testing VtsHalRadioV1_2Target.

Symptom:

When vts process slot2 "startnetworkscan", it will call "stopnetworkscan()" when startnetworkscan
success. But from current design it will set stopnetworkscan to slot1(wrong slot, expect is slot2)
as bwlow log.

CTS fail log:
hardware/interfaces/radio/1.2/vts/functional/radio_hidl_hal_test.cpp:111

//Device request NwScan on 2nd Sim
06-28 11:30:22.770 radio   873  1213 F RILQ    : RIL[1][Log.cpp: 48] [DispatcherModul(873,1213)]
d: [DispatcherModule]: Handling msg = RIL_REQUEST_START_NETWORK_SCAN

//But Device want to abort on Primary Sim
06-28 11:30:22.776 radio   923  1205 F RILQ    : RIL[0][Log.cpp: 48] [DispatcherModul(923,1205)]
d: [NasModule]: Handling msg = RIL_REQUEST_STOP_NETWORK_SCAN[Context: IRadio(1681692777)]

Bug: 135982495
Test: Build pass. Local test VTS pass.
Change-Id: Ic53c24ab2a670e806b4ac7f192e6eb81252ade84
2019-07-03 10:16:10 +08:00
Felix
551b8d15ce Add interface info to .rc files
Signed-off-by: Felix <google@ix5.org>
Change-Id: I6d70bbdb66c3dce280bf6908c3750316a6f6cf70
2019-06-25 20:00:07 +02:00
terrycrhuang
6e470f1755 Merge "VTS: stop network scan once trigger network scan success" into qt-dev
am: 6a660a6d7b

Change-Id: I20ea717cdfdefb3ec67a1c8cae80b57ea9937217
2019-06-19 23:47:55 -07:00
terrycrhuang
a2affa6636 VTS: stop network scan once trigger network scan success
For some vendors do not supports independent radios, if
there is one manual search ongoing, another manual search
on other SIM is not supported. So sending stop network scan
request once trigger network scan completed to exclude this
modem limitation.

Bug: 135005200
Test: atest RadioHidlTest_v1_2#startNetworkScan

Change-Id: Iacfd59ac2ad4d44e763ee03697c1f8f57162ce38
2019-06-19 00:53:29 +00:00
Nathan Harold
1999cba432 Merge changes I94874f53,I90133555 into qt-dev
am: 1d957da30b

Change-Id: I64ca48b5863d454d9f623845344b081b32050b2f
2019-05-22 14:17:19 -07:00
Nathan Harold
81c811b895 Enable incremental scans for interval checks
Currently tests that check for incremental scan interval
range-checking have incremental scans disabled.
This CL turns on incremental scans for tests where the
invalid interval range checks are being validated.

Bug: 112486807
Test: atest RadioHidlTest_v1_2#startNetworkScan_InvalidPeriodicity1;
      atest RadioHidlTest_v1_2#startNetworkScan_InvalidPeriodicity2;
Merged-In: I94874f538d2df70a72913b489d9298f8d1cf9b56
Change-Id: I94874f538d2df70a72913b489d9298f8d1cf9b56
(cherry picked from commit f56b9a41dd)
2019-05-22 11:31:48 -07:00
Nathan Harold
beb15ccb08 Allow impls to ignore incremental scan interval
When incremental results are disabled for network scans,
update the API documentation to allow implementations to
ignore range checking for the incremental scan interval.

Bug: 112486807
Test: compilation - docstring-only change
Merged-In: I901335550b4b8c2cf75f91b39fd031f03ffae982
Change-Id: I901335550b4b8c2cf75f91b39fd031f03ffae982
(cherry picked from commit 944efca78d)
2019-05-22 11:31:33 -07:00
Nathan Harold
f56b9a41dd Enable incremental scans for interval checks
Currently tests that check for incremental scan interval
range-checking have incremental scans disabled.
This CL turns on incremental scans for tests where the
invalid interval range checks are being validated.

Bug: 112486807
Test: atest RadioHidlTest_v1_2#startNetworkScan_InvalidPeriodicity1;
      atest RadioHidlTest_v1_2#startNetworkScan_InvalidPeriodicity2;
Change-Id: I94874f538d2df70a72913b489d9298f8d1cf9b56
2019-05-22 10:07:11 -07:00
Nathan Harold
944efca78d Allow impls to ignore incremental scan interval
When incremental results are disabled for network scans,
update the API documentation to allow implementations to
ignore range checking for the incremental scan interval.

Bug: 112486807
Test: compilation - docstring-only change
Change-Id: I901335550b4b8c2cf75f91b39fd031f03ffae982
2019-05-22 10:07:11 -07:00
Youming Ye
bb560adb22 Merge "Add mnc and mcc string check" 2019-05-16 17:27:35 +00:00
Youming Ye
b386096472 Merge "Add mnc and mcc string check" into qt-dev
am: 82dc3faca0

Change-Id: Ia26b3e5e6ba7331b906bb8bbe6a56c03fd693a02
2019-05-15 21:15:38 -07:00
TreeHugger Robot
82dc3faca0 Merge "Add mnc and mcc string check" into qt-dev 2019-05-16 02:49:01 +00:00
Youming Ye
8a9e5a645b Add mnc and mcc string check
Use the same resolution as 1.0 to check for invalid mnc and mcc values.

Bug: 130206359
Test: Vts
Change-Id: Iff766014ecfbe2d77db6771eda04fd4d9c84df14
2019-05-15 16:52:09 -07:00
Youming Ye
27227fd1b0 Add mnc and mcc string check
Use the same resolution as 1.0 to check for invalid mnc and mcc values.

Bug: 130206359
Test: Vts
Change-Id: Iff766014ecfbe2d77db6771eda04fd4d9c84df14
2019-05-15 16:35:40 -07:00
Nathan Harold
1ff574dc63 Use Widely Supported GSM Channels for NetworkScan
Change the network scan tests to use the P900 and 850
GSM bands, which are commonly (nearly universally) supported
bands.

Bug: 132076611
Test: atest RadioHidlTest_v1_2
Merged-In: Ia682f022d35c481876c49c9c8802d7c39722be0e
Change-Id: Ia682f022d35c481876c49c9c8802d7c39722be0e
(cherry picked from commit 2ea2a64bc7)
2019-05-13 20:21:23 +00:00
Nathan Harold
2ea2a64bc7 Use Widely Supported GSM Channels for NetworkScan
Change the network scan tests to use the P900 and 850
GSM bands, which are commonly (nearly universally) supported
bands.

Bug: 132076611
Test: atest RadioHidlTest_v1_2
Change-Id: Ia682f022d35c481876c49c9c8802d7c39722be0e
2019-05-10 14:11:14 -07:00
Nathan Harold
e678690efa Revert "Use Widely Supported GSM Channels for NetworkScan"
This reverts commit 92bb3ae7b9.

There is an issue with the bands used for P900... the chosen
bands were for PCS1900. Quick fix coming.
2019-05-10 14:08:35 -07:00
Nathan Harold
92bb3ae7b9 Use Widely Supported GSM Channels for NetworkScan
Change the network scan tests to use the P900 and 850
GSM bands, which are commonly (nearly universally) supported
bands.

Bug: 132076611
Test: atest RadioHidlTest_v1_2
Change-Id: Icb4dc47360a5753b9697f74aec19045155ee27fc
2019-05-09 18:45:23 -07:00
Steven Moreland
1ae4615d9f Update hidl makefiles for bpfmt
hidl-generated makefiles are now generated such that bpfmt(file) == file.

Bug: 67417008
Test: enable bpfmt hook
Change-Id: I1f69d292bc23a7cc293a66110cb02d597e1019ad
2019-04-17 09:38:50 -07:00
Steven Moreland
a878aee9ab Update makefies: no 'types'
Bug: 123976090
Test: N/A
Change-Id: I30fb04c81889b62775e1b764b965fdb0f893de17
2019-03-04 11:27:17 -08:00
Nathan Harold
5109018dfa Explicitly Document INT_MAX for Invalid Fields
When fields are inapplicable, they should not
be set to a clearly out-of-range value to signal
to the framework that those fields are not used.
In some cases, there is an in-range invalid value
that has been defined by the standards. The docs
are inconsistent in calling out INT_MAX as the
value to be used when something is inapplicable
vs the case when a measurement is simply not
reported. In all cases, INT_MAX can be used to
denote an invalid value, and in cases where the
field/structure is inapplicable, it is the correct
value. This CL updates all the docstrings for
SignalStrength-related fields to clarify that
INT_MAX is the correct "invalid" value for cases
when fields are inapplicable.

Bug: 123088652
Test: compilation (docstring-only change); CTS
    naturally enforces this change on devices with
    newer HALs; backwards compatibility is preserved
    for existing HAL versions.

Change-Id: I5cfa917f504d15691ab3f2c298189bdd47794a42
2019-01-28 18:59:08 -08:00