Yin-Chia Yeh
cb3c3a52ef
Merge "Camera: reset callback after test done" into oc-dr1-dev am: eba1407b55
...
am: 6277952f30
-s ours
Change-Id: I321e1c2b8d79236055a97699408c6fb0dd99be45
2017-07-27 02:07:38 +00:00
Yin-Chia Yeh
6e9018e807
Merge "Camera: reset callback after test done" into oc-dr1-dev am: eba1407b55
-s ours
...
am: 8d1ef0505f
Change-Id: I7f26656d68a93daadec816d3fe28a000212dd9e4
2017-07-27 02:03:48 +00:00
Yin-Chia Yeh
8d1ef0505f
Merge "Camera: reset callback after test done" into oc-dr1-dev
...
am: eba1407b55
-s ours
Change-Id: Ia0b6863fa82f33d03903f6e17739f8ad339246c5
2017-07-27 01:15:25 +00:00
Yin-Chia Yeh
557cce559a
Camera: reset callback after test done
...
Back port from master
Test: VTS test pass
Bug: 63570734
Change-Id: Ic0eecaf843b5c2e78f60325090ea652d43a74a0b
Merged-In: Ic0eecaf843b5c2e78f60325090ea652d43a74a0b
2017-07-26 17:13:30 -07:00
Tomasz Wasilczyk
c1763a6796
Fix remaining broadcastradio 1.1 VTS TODOs.
...
This includes:
- cover all AM/FM bands, not just first one
- fix flakiness on late callback dereference
- fix 1.0 tuneComplete check
- move utils includes into separate subdirectories
Bug: b/36864490
Test: VTS
Change-Id: I6e2427ac29abd6278c9783cf83b4df05195ac7ea
2017-07-26 14:41:35 -07:00
Yin-Chia Yeh
6277952f30
Merge "Camera: reset callback after test done" into oc-dr1-dev
...
am: eba1407b55
Change-Id: I2ab3b17ad9a0b4893a31d5c50f65ccf72d43c315
2017-07-26 21:36:53 +00:00
TreeHugger Robot
eba1407b55
Merge "Camera: reset callback after test done" into oc-dr1-dev
2017-07-26 21:28:45 +00:00
Ying Xu
830d07c72d
Merge "Fix VTS errors of the network scan API" into oc-dr1-dev am: 6bba7c9ca4
...
am: b7af89f838
Change-Id: Id401f0154d24764dc1309e0984b1b310d5a05d2d
2017-07-26 20:06:03 +00:00
Zhuoyao Zhang
1776a3f3e0
Merge "Move android.hardware.tests.msgq@1.0-impl to system.img" into oc-dr1-dev am: 5614b96de5
-s ours
...
am: e37bbc1522
-s ours
Change-Id: Ibdf81abee5fa042085563b53c28f252c4b7bc2c3
2017-07-26 20:05:46 +00:00
Zhuoyao Zhang
928e9927d7
Merge "Move all hidl_test dependencies to the system.img" into oc-dr1-dev am: ab23aa7667
-s ours
...
am: ed0ba15028
-s ours
Change-Id: I9456687ee58b66fd06171833be29f9671c3981ee
2017-07-26 20:05:32 +00:00
Zhuoyao Zhang
2dfa2135e0
Merge "resolve merge conflicts of 8d92561 to oc-mr1-dev" into oc-mr1-dev
...
am: 7c6c8f47c8
-s ours
Change-Id: I85140aa418bb451fbcbb34e9c78aa8fa9831af23
2017-07-26 20:05:16 +00:00
Ying Xu
b7af89f838
Merge "Fix VTS errors of the network scan API" into oc-dr1-dev
...
am: 6bba7c9ca4
Change-Id: I8a570589c85c8d6b1f327b5df341d31d4aaff5b6
2017-07-26 19:58:05 +00:00
Zhuoyao Zhang
e37bbc1522
Merge "Move android.hardware.tests.msgq@1.0-impl to system.img" into oc-dr1-dev
...
am: 5614b96de5
-s ours
Change-Id: I96a35e355d85137462f8dbb9d4d7eb25d047efcb
2017-07-26 19:57:24 +00:00
Zhuoyao Zhang
ed0ba15028
Merge "Move all hidl_test dependencies to the system.img" into oc-dr1-dev
...
am: ab23aa7667
-s ours
Change-Id: I21227e9ca0dd9d4a90098e6e5cde49082bab4d4f
2017-07-26 19:56:55 +00:00
Zhuoyao Zhang
a2559baa62
resolve merge conflicts of 8d92561 to oc-mr1-dev
...
am: a27606b640
-s ours
Change-Id: I251bfac3eb2167400e2510679dd4dd22806c282e
2017-07-26 19:49:58 +00:00
Zhuoyao Zhang
fb28df0233
resolve merge conflicts of 8d92561 to oc-mr1-dev
...
am: 9ff0bb218b
-s ours
Change-Id: Ied5990b4138f78deab806bdd8c532cbeee5eb58b
2017-07-26 19:49:49 +00:00
Zhuoyao Zhang
7c6c8f47c8
Merge "resolve merge conflicts of 8d92561 to oc-mr1-dev" into oc-mr1-dev
2017-07-26 19:38:22 +00:00
Ying Xu
836df4c7c3
Merge "Fix VTS errors of the network scan API" into oc-dr1-dev am: 6bba7c9ca4
...
am: d9cdb2181d
Change-Id: I8d29e4778235d7bc30a0b2c541007854e64a9214
2017-07-26 18:30:58 +00:00
Sohani Rao
15ed448e49
Wifi Offload HAL: Improve VTS tests for scanConfig
...
Configure scans with test parameters from the Offload HAL service.
Bug: 36865676
Test: VTS tests
Change-Id: Iec5a3e837f9a2e2cf285b079a4630ff273727679
2017-07-26 11:29:37 -07:00
Ying Xu
d9cdb2181d
Merge "Fix VTS errors of the network scan API" into oc-dr1-dev
...
am: 6bba7c9ca4
Change-Id: Ida8be5c1e8f34a8fad520964b1a7104f9744efc1
2017-07-26 18:14:56 +00:00
yinxu
0e9094142f
Fix VTS errors of the network scan API
...
Since the new network scan API is only supported by some devices, we
should add the REQUEST_NOT_SUPPORTED to the possible returned errors.
Cherry-picked cleanly from:
https://googleplex-android-review.git.corp.google.com/#/c/2596051/
Test: Telephony sanity tests, run vts -m VtsHalRadioV1_1Target
Bug: 63914600
Merged-in: I965ee6422aaa5e02bf67466f5288b808183f1738
Change-Id: I965ee6422aaa5e02bf67466f5288b808183f1738
(cherry picked from commit 03c6b592c1
)
2017-07-26 11:09:44 -07:00
Ying Xu
6bba7c9ca4
Merge "Fix VTS errors of the network scan API" into oc-dr1-dev
2017-07-26 17:46:56 +00:00
Steven Moreland
7206708528
Update HIDL makefiles.
...
Allow them to be static.
This is required for a couple of reasons:
- enabling HIDL passthrough in recovery
- enabling VTS tests to be static blobs
Bug: 32920003
Bug: 64040096
Test: update-all-google-makefiles.sh
Change-Id: I1b2401fb273ab80819e3870aa71fe742269674ba
2017-07-26 10:14:57 -07:00
Emilian Peev
7596b25bf9
Camera: Update stream consumer usage flag
...
It is possible that the current default consumer usage
flag may not be supported by some provider implementations.
Use either HW composer or some other flag that is appropriate
for the specific use case.
Merged-In: I04f89bf67166805191d6d40e5bd93c15ebc97ea6
Bug: 63913159
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --primary-abi-only --module
VtsHalCameraProviderV2_4Target -l INFO
Change-Id: I04f89bf67166805191d6d40e5bd93c15ebc97ea6
2017-07-26 11:15:38 +01:00
Zhuoyao Zhang
a27606b640
resolve merge conflicts of 8d92561 to oc-mr1-dev
...
Test: I solemnly swear I tested this conflict resolution.
2017-07-25 21:16:04 -07:00
Zhuoyao Zhang
9ff0bb218b
resolve merge conflicts of 8d92561 to oc-mr1-dev
...
Test: I solemnly swear I tested this conflict resolution.
2017-07-25 21:14:07 -07:00
Zhuoyao Zhang
6bc3eb9ed6
Merge "Move android.hardware.tests.msgq@1.0-impl to system.img" into oc-dr1-dev am: 5614b96de5
-s ours
...
am: 3db81e41d1
-s ours
Change-Id: Id914832bab75b8302f51a9e35d4269d10cbfc093
2017-07-26 03:27:48 +00:00
Zhuoyao Zhang
42cc416a95
Move android.hardware.tests.msgq@1.0-impl to system.img am: 2d2b64e241
-s ours
...
am: 304ba05feb
-s ours
Change-Id: I01cae4c02f0dce584db19792f989a0d3fc4d4903
2017-07-26 03:24:15 +00:00
Zhuoyao Zhang
4fe199047e
Merge "Move all hidl_test dependencies to the system.img" into oc-dr1-dev am: ab23aa7667
-s ours
...
am: f3feaf41a9
-s ours
Change-Id: Idff0ca6b5a9b12252a0a566cc92bb144e4fdd215
2017-07-26 03:24:12 +00:00
Zhuoyao Zhang
3db81e41d1
Merge "Move android.hardware.tests.msgq@1.0-impl to system.img" into oc-dr1-dev
...
am: 5614b96de5
-s ours
Change-Id: Ia14d4a6e7c93aae761ab79fb0bdb86091b463313
2017-07-26 03:22:04 +00:00
Zhuoyao Zhang
304ba05feb
Move android.hardware.tests.msgq@1.0-impl to system.img
...
am: 2d2b64e241
-s ours
Change-Id: I04b7c8b98251649f7db5f0d3e4044390b3b3b5a3
2017-07-26 03:20:30 +00:00
Zhuoyao Zhang
f3feaf41a9
Merge "Move all hidl_test dependencies to the system.img" into oc-dr1-dev
...
am: ab23aa7667
-s ours
Change-Id: I4988d06cb6c53ed1384b2c7bef19afa23adc5dc6
2017-07-26 03:20:21 +00:00
Zhuoyao Zhang
5614b96de5
Merge "Move android.hardware.tests.msgq@1.0-impl to system.img" into oc-dr1-dev
2017-07-26 03:15:14 +00:00
Zhuoyao Zhang
ab23aa7667
Merge "Move all hidl_test dependencies to the system.img" into oc-dr1-dev
2017-07-26 03:15:14 +00:00
Enrico Granata
5aa4b5d232
Rename the enums that are supposed to match OBD2 values to have an Obd2 prefix
...
Rename the enums that contain a list of sensors and don't directly map to OBD2 to have a Diagnostic prefix
Test: clean build and flash, then
runtest -x packages/services/Car/tests/android_car_api_test/src/android/car/apitest/CarDiagnosticManagerTest.java
runtest -x packages/services/Car/tests/carservice_test/src/com/android/car/test/CarDiagnosticManagerTest.java
runtest -x packages/services/Car/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/Obd2FreezeFrameTest.java
runtest -x packages/services/Car/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/Obd2LiveFrameTest.java
Bug: 64024685
Change-Id: I9147bcd8f2972dee9f3d1e62f8978b595d88f606
2017-07-25 17:20:53 -07:00
yinxu
03c6b592c1
Fix VTS errors of the network scan API
...
Since the new network scan API is only supported by some devices, we
should add the REQUEST_NOT_SUPPORTED to the possible returned errors.
Test: Telephony sanity tests, run vts -m VtsHalRadioV1_1Target
Bug: 63914600
Change-Id: I965ee6422aaa5e02bf67466f5288b808183f1738
2017-07-25 15:15:52 -07:00
Enrico Granata
e371a4c8b0
Merge "Remove unnecessary whitespace from enum members in OBD2 properties" into oc-mr1-dev
...
am: 87a14154a9
Change-Id: I1a7e9c0f4865649b127e0388970fe0d19aaef94c
2017-07-25 21:38:36 +00:00
Eino-Ville Talvala
84ce3d51d7
Merge "Camera: Don't enforce result metadata queue support" into oc-dev am: 1d1b503b77
-s ours am: 6447e22219
-s ours
...
am: 8ee53284fd
-s ours
Change-Id: Ib12425cbf8137a59652849b959d2a3ffd6fe5f1b
2017-07-25 21:30:23 +00:00
Eino-Ville Talvala
08be1457f3
Merge "Camera: Don't enforce result metadata queue support" into oc-dr1-dev am: 5bc1afb63d
-s ours
...
am: 2be29abd56
-s ours
Change-Id: I46df8f68fd105a352633b69c434312cc430ec53b
2017-07-25 21:30:08 +00:00
Eino-Ville Talvala
c1c4bf18d1
Merge "Camera: Don't enforce result metadata queue support" into oc-dev am: 1d1b503b77
-s ours am: 6447e22219
-s ours
...
am: 9276baafa3
-s ours
Change-Id: Ia4868ef8a4fd531eb9ee431edd0e99f1dcd67ff9
2017-07-25 21:29:24 +00:00
Eino-Ville Talvala
44d20d831d
Merge "Camera: Don't enforce result metadata queue support" into oc-dr1-dev am: 5bc1afb63d
-s ours
...
am: 7e0091ed83
-s ours
Change-Id: I23e400e1d7f9fa0bc8f8209659c9231d3ecf3ed9
2017-07-25 21:29:07 +00:00
Andrew Scull
0848eab0b7
Merge "Weaver: functional VTS tests" into oc-dr1-dev am: 1bef889c75
...
am: 20331bbb41
Change-Id: I4b5d46708dcb70fbbdb512240a1fbaa4abbbf343
2017-07-25 21:28:23 +00:00
TreeHugger Robot
87a14154a9
Merge "Remove unnecessary whitespace from enum members in OBD2 properties" into oc-mr1-dev
2017-07-25 21:27:44 +00:00
Andrew Scull
02b90aecda
Merge "OemLock functional VTS test." into oc-dr1-dev am: 831af8d840
...
am: cf83546f12
Change-Id: I0ef64cd5ae3fd96a601b62a77127484461bb3c97
2017-07-25 21:27:21 +00:00
Andrew Scull
045963c3de
Merge "Weaver: functional VTS tests" into oc-dr1-dev am: 1bef889c75
...
am: ed0d4ac710
Change-Id: I82219d83d90d6737334c80e09e960be406085354
2017-07-25 21:25:11 +00:00
Andrew Scull
324f3a9645
Merge "OemLock functional VTS test." into oc-dr1-dev am: 831af8d840
...
am: ad8db51179
Change-Id: Ie0f2abb0ebd997599afdba421cae89e2ef1700d4
2017-07-25 21:24:28 +00:00
Eino-Ville Talvala
f52993f46f
Merge "Camera: Don't enforce result metadata queue support" into oc-dev am: 1d1b503b77
am: 4c652d5639
...
am: 73d517be5c
-s ours
Change-Id: I494b8b7e4e6ef2c5d23fa5ec9e2071240307c9e7
2017-07-25 21:24:09 +00:00
Eino-Ville Talvala
9276baafa3
Merge "Camera: Don't enforce result metadata queue support" into oc-dev am: 1d1b503b77
-s ours
...
am: 6447e22219
-s ours
Change-Id: I66ae022e8b4f2da71a5a924a1e52942dbd412a4d
2017-07-25 21:22:30 +00:00
Eino-Ville Talvala
8ee53284fd
Merge "Camera: Don't enforce result metadata queue support" into oc-dev am: 1d1b503b77
-s ours
...
am: 6447e22219
-s ours
Change-Id: I42030ef2c1dc8f6fe7427342df101599c3252552
2017-07-25 21:22:26 +00:00
Eino-Ville Talvala
7e0091ed83
Merge "Camera: Don't enforce result metadata queue support" into oc-dr1-dev
...
am: 5bc1afb63d
-s ours
Change-Id: Ic07d12157eb9949a5416677f99e9759e73e36c0d
2017-07-25 21:22:13 +00:00