Commit graph

279 commits

Author SHA1 Message Date
Dan Shi
c325670cf9 Merge changes from topic "gnss"
* changes:
  Convert VtsHalGnssV2_0TargetTest to be parameterized test
  Convert VtsHalGnssV1_1TargetTest to be parameterized test
2019-10-17 16:10:59 +00:00
Dan Shi
89af69eb05 Convert VtsHalGnssV2_0TargetTest to be parameterized test
Bug: 142397658
Test: atest VtsHalGnssV2_0TargetTest
atest VtsHalGnssV2_0Target

Change-Id: I0402e62265f71b4e2c141624ce12b627d965c8ee
2019-10-16 14:34:56 -07:00
Dan Shi
4652a0e565 Convert VtsHalGnssV1_1TargetTest to be parameterized test
Bug: 142397658
Test: atest VtsHalGnssV1_1TargetTest
atest VtsHalGnssV1_1Target

Change-Id: I575630c8cbbf8bbd341425c5bbe04ca49c2c1758
2019-10-16 14:32:28 -07:00
Dan Shi
17d6fd3b01 Merge "Convert VtsHalGnssV1_0TargetTest to be parameterized test" am: 21eb2f5359 am: 2f9fc3f4de am: 1a110be9db
am: c9b0171d42

Change-Id: I209e7b2b5a769a22f8429be70e4dc950377b7697
2019-10-16 12:26:58 -07:00
Dan Shi
2f9fc3f4de Merge "Convert VtsHalGnssV1_0TargetTest to be parameterized test"
am: 21eb2f5359

Change-Id: Iff3f15a4a4367ddf46e285bdfa8591381209b40b
2019-10-16 12:06:58 -07:00
Dan Shi
21eb2f5359 Merge "Convert VtsHalGnssV1_0TargetTest to be parameterized test" 2019-10-16 18:54:33 +00:00
Nick Desaulniers
7dac45d65b Merge "[hardware][interfaces][gnss] fix -Wreorder-init-list" am: d2e8d0b515 am: 1bb718baeb am: 1dbd38952a
am: 97e49fa08c

Change-Id: I4ab51d7692118780e72914084f0268e691afdd20
2019-10-15 15:34:48 -07:00
Nick Desaulniers
1bb718baeb Merge "[hardware][interfaces][gnss] fix -Wreorder-init-list"
am: d2e8d0b515

Change-Id: Iee8c0aa77b4559f656e0f19cbbe786ca200e8584
2019-10-15 15:16:29 -07:00
Dan Shi
47e47836e5 Convert VtsHalGnssV1_0TargetTest to be parameterized test
Bug: 142397658
Test: atest VtsHalGnssV1_0TargetTest
atest VtsHalGnssV1_0Target

Change-Id: Ife6361f481409c3bac7ae518259bbc9837ccbdef
2019-10-15 09:25:51 -07:00
Nick Desaulniers
477c7e87b3 [hardware][interfaces][gnss] fix -Wreorder-init-list
C++20 will require members in a designated initializer to be in order
unlike C99.

Bug: 139945549
Test: mm
Change-Id: Ifdccde48c47c0495467f438002caf91cfdbd8091
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
2019-10-14 11:05:44 -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
38c46d0b98 Merge "Remove libhwbinder/libhidltransport deps" am: 6b62c58a9a am: 8c22c3862f am: 6684ee8c36
am: 9a5ffa3196

Change-Id: I3a80895d10767fe68e90a907312a83ded976cbcc
2019-09-06 16:06:13 -07:00
Steven Moreland
6684ee8c36 Merge "Remove libhwbinder/libhidltransport deps" am: 6b62c58a9a
am: 8c22c3862f

Change-Id: Iaedfceb49f81387f7deaad434613b7c9f1c502a0
2019-09-06 14:28:04 -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
Anil Admal
d3bef8732c Address GNSS VTS code duplication (part 1)
-Moved GNSS callback event queue class from VTS 2.0 code
 into common library that is shared with all GNSS VTS tests.
-Modified VTS 1.1 code to reuse GNSS callback event queue in
 order to address potential issues noted in b/131869042 and
 also to later extract common code from VTS 1.1 and VTS 2.0
 into common library.

Bug: 136515339
Test: atest VtsHalGnssV2_0TargetTest
      atest VtsHalGnssV1_1TargetTest

Change-Id: I9356e7653f9784a9149b2c2bd6307750e9cc56b3
2019-07-30 18:25:29 -07:00
Anil Admal
79f9484c6b Merge "VTS 1.1 TestGnssMeasurementCallback test must allow 1.1 or 1.0 versions" into qt-r1-dev
am: f22b39c457

Change-Id: Ic7bd9b309d7e9fe7a2317c4dcba85bd87fa1431f
2019-07-19 11:25:34 -07:00
Anil Admal
6abdaac714 VTS 1.1 TestGnssMeasurementCallback test must allow 1.1 or 1.0 versions
Fixes: 137839372
Test: atest VtsHalGnssV1_1Target
Change-Id: Ie3b1fa8b4738c03bff7924396b5eb5c6774841f1
2019-07-18 18:40:53 -07:00
Anil Admal
dbef8877c0 Merge "Add GetLocationLowPower VTS 2.0 test" into qt-r1-dev
am: 954f4fef65

Change-Id: Id553c7b77c0b87e29c8055eb9421823b198a3a9d
2019-07-17 14:57:09 -07:00
Anil Admal
03bc98e028 Add GetLocationLowPower VTS 2.0 test
- Run test only if LOW_POWER_MODE capability is supported.
- Modify the corresponding VTS 1.1 test to run only if the GNSS
  HAL version is 1.1.

Fixes: 127434062
Test: atest VtsHalGnssV2_0Target
Change-Id: Icbd18d80468e9e5a542f2eace5bfbe45af08ca47
2019-07-15 18:56:37 -07: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
Anil Admal
b821d8e59f Merge "Add GNSS satellite blacklist VTS 2.0 test" into qt-r1-dev
am: 27c44d047a

Change-Id: Id41c14d75616be6ae4650a1188acd253ac96cc39
2019-06-28 15:44:01 -07:00
Anil Admal
f42602678f Add GNSS satellite blacklist VTS 2.0 test
- Use IGnssCallback@2.0::gnssSvStatusCb_2_0() method to receive SV
  info.
- Run the test only if SATELLITE_BLACKLIST capability is supported.
- IRNSS is excluded from blacklisting as IGnssConfiguration@2.0 is
  not updated to support the blacklisting new constellation type.
- Modify the corresponding VTS 1.1 test to run only if the GNSS
  HAL version is 1.1.

Bug: 128028791
Test: atest VtsHalGnssV2_0Target
Change-Id: Idd44a5a1c9d54d7434da945ecbd1ee90007f5054
2019-06-26 18:26:36 -07: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
Anil Admal
de913c6979 Merge "Update @2.0::IGnss.hal setCallback() method documentation" into qt-dev
am: a12498abf8

Change-Id: I16d1c533066cc90c08d0ec8c61b98ccf54bd4a34
2019-05-10 09:11:43 -07:00
Anil Admal
bc5fcc4019 Merge "Clarify when IGnss.hal cleanup() and setCallback() methods are called" into qt-dev
am: 88d9d2570e

Change-Id: I775555a6e8394ca0954ab90fa0e08d50f73ab8cf
2019-05-10 09:05:47 -07:00
Anil Admal
a12498abf8 Merge "Update @2.0::IGnss.hal setCallback() method documentation" into qt-dev 2019-05-10 16:00:07 +00:00
Anil Admal
2f28bb0c19 Clarify when IGnss.hal cleanup() and setCallback() methods are called
Update IGnss.hal cleanup() and setCallback() method documentation to
clarify when the framework calls these methods so that the GNSS engine
knows when to shut down for power savings.

This CL updates @1.1::IGnss.hal and @1.0::IGnss.hal interfaces only.
@2.0::IGnss.hal is updated in another CL.

Bug: 124104175
Test: Existing tests pass
Change-Id: I8181251677dab78ce0619fa1e2a667b36e115f25
2019-05-09 16:32:06 -07:00
Anil Admal
a3afa5c65c Update @2.0::IGnss.hal setCallback() method documentation
The IGnss.hal setCallback() and cleanup() methods need to be updated
to clarify when the framework calls them so that that the GNSS engine
knows when to shut down for power savings.

This CL updates the @2.0::IGnss.hal setCallback() method documenation
only. The @1.1::IGnss.hal and @1.0::IGnss.hal setCallback() and cleanup()
method documentation is updated in another CL.

Bug: 124104175
Test: Existing tests pass
Change-Id: I6a2dd6f82becc0adef8b4b56fe83e7c004aefd7a
2019-05-09 15:58:00 -07:00
Anil Admal
3e346ff672 Merge "Fix wait/notify logic in GNSS VTS 2.0 test cases (part 2)" into qt-dev
am: e5289f618c

Change-Id: Idb35e4ccf2c5a7825aa88c15e7e815b5206d4448
2019-05-06 18:38:30 -07:00
Anil Admal
2690a27d8d Fix wait/notify logic in GNSS VTS 2.0 test cases (part 2)
Addresses follow up code review comments after merge of ag/7324643.

Fixes: 131869042
Test: atest VtsHalGnssV2_0TargetTest
Change-Id: I0177ee60c5edfb6855ce6a1d45b8805166a33cf2
2019-05-06 12:09:57 -07:00
Anil Admal
bf6201d843 Merge "Fix wait/notify logic in GNSS VTS 2.0 test cases" into qt-dev
am: 5f6334036f

Change-Id: I2888a2b267490b1ceccb3fb6494dd0c357003fcf
2019-05-04 19:51:06 -07:00
Anil Admal
7f9c13e198 Fix wait/notify logic in GNSS VTS 2.0 test cases
Fixes: 131869042
Test: atest VtsHalGnssV2_0TargetTest
Change-Id: I6fe5713c0f1d329f2738a2d4ba4a7d5aa58efec9
2019-05-03 17:31:20 -07:00
Anil Admal
f9e2ec1bc3 Merge "Update GNSS VTS 2.0 tests to address sub-HAL support requirements" into qt-dev
am: bb477b95ad

Change-Id: I15e394aef23bd4d3d1b9796018ee741bec63d78d
2019-05-02 21:36:03 -07:00
Anil Admal
62d2ca7687 Update GNSS VTS 2.0 tests to address sub-HAL support requirements
- IGnssConfiguration.hal@2.0 must be supported.
- If IAGnss.hal is supported, it must be at IAGnss.hal@2.0
- If IAGnssRil.hal is supported, it must be at IAGnssRil.hal@2.0
- gnss.visibility_control sub-HAL is optional
- gnss.measurement_corrections sub HAL is optional.
- IGnssBatching.hal@2.0 support is optional.

Bug: 70978505
Test: atest VtsHalGnssV2_0TargetTest
Change-Id: Icf98c13ef32bdea7dafda8f79b685466712b16b6
2019-05-02 13:52:53 -07:00
Steven Moreland
99712c08cc Update hidl makefiles for bpfmt
hidl-generated makefiles are now generated such that bpfmt(file) == file.

Bug: 67417008
Test: enable bpfmt hook
Change-Id: I53e5bf67a0d314e1b10c0ba0c7172a7af358ddcc
2019-04-18 18:13:05 -07:00
Steven Moreland
6d494b2346 Merge "Update hidl makefiles for bpfmt" am: ff0bd741ca
am: 96f40f7b02

Change-Id: Idbf030e4993067bdb8181321bca2de00c9b6f7ef
2019-04-18 14:34:45 -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
Anil Admal
f45338a356 Restore gnss@1.1 HAL capability bits removed in gnss@2.0 (hal)
In the IGnssCallback.hal@2.0 introduced in Android Q, the
capability bits in IGnssCallback.hal@1.1 that represent sub-HAL
interfaces have been removed as they are derivable from the
existing getExtensionXXX() family of methods in the IGnss.hal
interface.

These need to be restored back as the synchronous nature of the
getExtensionXXX() methods called by the framework has an impact on
partner implementations that need to communicate with the modem to
get the capabilities.

Additionally, the capability bit MEASUREMENT_CORRECTIONS needs to be
added for the new optional measurement_corrections@1.0 sub-HAL
introduced in gnss@2.0.

Fixes: 129870126
Test: Verified through cuttlefish default implementation and VTS tests.
Change-Id: Ib4164c9501b8db9f09eb5429a077d477d0a4a7f9
2019-04-04 17:16:10 +00:00
Anil Admal
704bc613e0 Revert "Revert "Update GNSS Batching to use new GnssLocation with elapsed realtime (HAL)""
This reverts commit b3721a68f2.

Reason for revert: 
It appears that the build includes ag/6721678 but not ag/6762021 even though they both were submitted together. Hence the build errors.

Change-Id: I4e58b29239d291ae3621b90e4507de8eb8838298
2019-03-21 18:45:30 +00:00
Donghui Han
b3721a68f2 Revert "Update GNSS Batching to use new GnssLocation with elapsed realtime (HAL)"
This reverts commit 992cdabf3a.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I0215f172f2d37654937ca72522e110a33c2f63c7
2019-03-21 17:42:42 +00:00
Anil Admal
992cdabf3a Update GNSS Batching to use new GnssLocation with elapsed realtime (HAL)
The ElapsedRealTime field was added to the GnssLocation in
gnss@2.0 HAL to additionally report elapsed time since boot.
The IGnssBatchingCallback.hal@1.0 must be extended to use this
new version of GnssLocation so that the location reported in
gnssLocationBatchCb() method includes the ElapsedRealTime field.

Fixes: 128034260
Test: Tested the new GNSS Batching extension using default
      implementation, VTS test, and cuttlefish.
Change-Id: I326655130782a04fbe168d4582462a123edd9ac2
2019-03-20 14:21:54 -07:00
Yu-Han Yang
6999a0f547 Add IRNSS to GnssConstellationType (HAL)
Bug: 119270132
Test: atest VtsHalGnssV2_0TestTarget
Change-Id: I3a5da40412a1e5dbe9410573ae2bc263643c585c
2019-03-19 22:00:17 -07:00
Anil Admal
86450fa579 Add new GNSS capabilities for year of hardware deprecation (HAL)
The following capabilities need to be added to the GNSS HAL interface
to enforce support through the CTS/VTS tests.

-Add low power mode capability.
-Add satellite blacklisting capability.
-Add measurement corrections capability and move capabilities in
 IGnssCallback.hal that are specific to measurement correctons
 to its own sub-HAL measurement_corrections@1.0.

Bug: 128028791
Bug: 127434062
Bug: 128309220
Test: Tested on cuttlefish using default implementation and VTS tests
Change-Id: I60dbd2ce3cce3cb871aa5f6b690ef881f8dc5705
2019-03-18 19:09:48 -07:00
Yu-Han Yang
221a85e014 Change CodeType from enum to string (HAL)
Bug: 127464982
Test: atest VtsHalGnssV2_0TargetTest
Change-Id: Ia8635c3c071bcb03b75d17ac1ba36767dc7eda72
2019-03-12 12:12:17 -07:00
TreeHugger Robot
dae56d57f4 Merge "Add VTS test for gnss.measurement_corrections@1.0" 2019-03-06 07:22:39 +00:00
Yu-Han Yang
08642f98a4 Add VTS test for gnss.measurement_corrections@1.0
- also implemented default implementation

Bug: 120529158
Fixes: 120529158
Test: tested on cuttlefish
Change-Id: I9e63dc35284effff351eabedade05ed147d1ef17
2019-03-05 19:30:39 -08:00
Steven Moreland
87f43604b9 Merge "Update makefies: no 'types' internal" 2019-03-05 17:40:03 +00:00
Steven Moreland
7f4e21adda Merge "Update makefies: no 'types'" am: 4ee5ec1469 am: bab622f6a6
am: 7224bc9bcf

Change-Id: I434939e0770afa436c532a945542fce30a71ef7d
2019-03-04 16:05:59 -08:00
Steven Moreland
b91ac5c6a0 Update makefies: no 'types' internal
Bug: 123976090
Test: N/A
Change-Id: I84b659b163b63d39535b462a3df8a9c19f680976
2019-03-04 14:09:25 -08:00