Commit graph

6307 commits

Author SHA1 Message Date
Kevin Rocard
488beb2db1 Audio policy config xsd: add missing gains and address in ports
No nexus/pixel device uses port gains and their configuration were taken
as reference for the xsd creation.

Gains in mixPort and devicePort are supported by the code and use by
oem. As a result the xsd should allow them.

For validation of this path, the xsd was run against the example xml in
the audiopolicy source. Several other misalignment were found. They will
be fix in an other patch.

The address is also an optional field that was forgotten for the same
reason.

Bug: b/63827061
Test: -noout xmllint --schema hardware/interfaces/audio/2.0/config/audio_policy_configuration.xsd frameworks/av/services/audiopolicy/config/audio_policy_configuration.xml
Test: the above command fails for some other xml node unrelated to this bug
Test: this is tracked by b/38184704
Change-Id: I8dae15eb85a6a6d43c87aa747daf92a88d3fdcc0
Signed-off-by: Kevin Rocard <krocard@google.com>
2017-07-27 15:51:04 -07:00
Yin-Chia Yeh
db11779c7e Merge "Camera: reset callback after test done" into oc-mr1-dev
am: d17bb31a0d

Change-Id: Ib7a08d2f8a403dfffe6930a7761579fdb1fa39d4
2017-07-27 22:14:31 +00:00
Yin-Chia Yeh
d17bb31a0d Merge "Camera: reset callback after test done" into oc-mr1-dev 2017-07-27 22:09:12 +00:00
Yin-Chia Yeh
12dfe7d2ce Merge "Camera: fix various VTS issues" into oc-mr1-dev
am: 34c5caaa9f

Change-Id: I8c8504fd95b96eef6a143d52a84b13e84c157539
2017-07-27 22:08:34 +00:00
TreeHugger Robot
34c5caaa9f Merge "Camera: fix various VTS issues" into oc-mr1-dev 2017-07-27 22:04:59 +00:00
sqian
5b26557330 Add vts test for setCarrierInfoForImsiEncryption
Currently there is no implementation for this api by vendor code.
So we should check only for REQUEST_NOT_SUPPPORTED or NONE
as error returned at present.

Test: run vts
Bug: 64073713
Change-Id: I27f544cf6521d2f913f97e1b8f662a05166ddc11
2017-07-27 15:00:12 -07:00
Yin-Chia Yeh
ffb4bf7d49 Merge "Camera: add camera owners" into oc-mr1-dev
am: b79e079219

Change-Id: I3cc84c8fe179e4a88e0514b93dbee4f771ca59c6
2017-07-27 21:07:28 +00:00
Roshan Pius
735ff43197 wifi(hidl): Modify the SAR power levels interface
Modifying the interface used to lower the tx power level for meeting SAR
requirements based on recommendation from the nexus hardware team. The
previous interface passed in a single power value in dBm for meeting SAR
requirements. However, the SAR requirements are more complex than that.
Based on the connection mode (802.11 a,b,g,n,ac) and the number of
streams that are active (MIMO), the SAR power levels are very
different. Using the previous interface would mean that we will have to
use the lowest power level among all the connection modes to meet the SAR
requirements. This would however result in us lowering the power much
more than needed (~2 dBm) for many connection modes.
Instead, we're switching to a more generic interface where the framework
informs the wifi chip that we're entering a special tx power mode scenario
(today, there is only 1 for voice call). The chip can then lookup the
extensive table of power levels for different connection modes which are
pre-populated by the OEM's in the BDF file to set the power level (depending
on the scenario framework sends and the active connection mode).

Bug: 62437848
Test: Manual tests
Change-Id: I5ee3f0d2c130958dbeb352e3b5ad9407f432624f
2017-07-27 14:05:03 -07:00
TreeHugger Robot
b79e079219 Merge "Camera: add camera owners" into oc-mr1-dev 2017-07-27 20:51:42 +00:00
sqian
1e5b695016 Add corresponding error code to fix vts test
Test: run vts
Bug: 63152815
Bug: 62989786
Bug: 64041522
Change-Id: Ifbd17f85b39221de31ec7884b30dc176e1cbd3ab
Merged-In: Ifbd17f85b39221de31ec7884b30dc176e1cbd3ab
2017-07-27 13:28:42 -07:00
Tomasz Wasilczyk
253437c905 Merge "Fix remaining broadcastradio 1.1 VTS TODOs." into oc-mr1-dev
am: 0beea0df7d

Change-Id: I664ce5da1b869221ca1ecd6808a98c5e89eddd18
2017-07-27 20:05:29 +00:00
Tomasz Wasilczyk
0beea0df7d Merge "Fix remaining broadcastradio 1.1 VTS TODOs." into oc-mr1-dev 2017-07-27 19:59:01 +00:00
Yin-Chia Yeh
fafbc479db Camera: fix various VTS issues
Also fix wrong return values for processCaptureRequest in default
wrapper.

Test: running camera VTS
Bug: 64041692
Change-Id: I397390af7c85a776713f6287bef1c4d11c721c9a
Merged-In: I397390af7c85a776713f6287bef1c4d11c721c9a
2017-07-27 18:45:30 +00:00
Yin-Chia Yeh
e9ab8227ae Camera: fix various VTS issues
Also fix wrong return values for processCaptureRequest in default
wrapper.

Test: running camera VTS
Bug: 64041692
Change-Id: I397390af7c85a776713f6287bef1c4d11c721c9a
2017-07-27 11:43:24 -07:00
Yin-Chia Yeh
feb0ddde26 Camera: add camera owners
Test: none
Change-Id: I1a221feea480139d78c9b10dcd6c7c88955901bd
Merged-In: I1a221feea480139d78c9b10dcd6c7c88955901bd
(cherry picked from commit 14a5810a2e)
2017-07-27 18:21:51 +00:00
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