Commit graph

7421 commits

Author SHA1 Message Date
Kevin Rocard
69a76b1dfa Audio VTS: improve audio policy validation error messages
If multiple config are found, each will be validated before failing the
test.
Also add a missing new line before dumping libxml2 errors.

Test: run the following script to check for regressions and test that
      invalid config make the test fail.

    runTest() {(
      set -xu
      local readonly MODULE=$1
      local readonly TEST=$2
      local readonly XML=$3
      runVTS() { vts-tradefed run commandAndExit vts \
            --skip-all-system-status-check --primary-abi-only \
            --skip-preconditions --module $MODULE -t $TEST |
                 awk '/FAILED: 0/{e=1} {print} END {exit !e}'; }

      local FAIL=0 # used instead of return if clean up is needed

      echo "# Test valid config"
      runVTS || return 1

      echo "# Test multiple invalid match"
      adb shell touch /system/etc/$XML
      runVTS && FAIL=2
      adb shell rm /system/etc/$XML

      echo "# Test multiple valid match (not supported if xinclude)"
      if !adb shell grep -q xi:include /vendor/etc/$XML; then
        adb shell cp /{vendor,system}/etc/$XML
        runVTS || FAIL=3
        adb shell rm /system/etc/$XML
      fi

      echo "# Test invalid config"
      adb shell sed -i "'2i<fuu/>'" /vendor/etc/$XML
      runVTS && FAIL=4
      adb shell sed -i 2d /vendor/etc/$XML

      echo "#Test no config"
      adb shell mv /vendor/etc/$XML{,.hide}
      runVTS && FAIL=5
      adb shell mv /vendor/etc/$XML{.hide,}

      echo "# Test that the test did not break the config"
      runVTS || FAIL=6

      return $FAIL
    )}
    runTest VtsHalAudioV2_0Target CheckConfig.audioPolicyConfigurationValidation audio_policy_configuration.xml &&
    runTest VtsHalAudioEffectV2_0Target CheckConfig.audioEffectsConfigurationValidation audio_effects.xml &&
    echo TEST PASSED

Bug: 64881365
Change-Id: If0443f85e0d687eed04819337519e4d9f09f5ca9
Signed-off-by: Kevin Rocard <krocard@google.com>
2017-09-26 17:15:59 +00:00
TreeHugger Robot
ffc151ca2a Merge "Register mock EVS driver as EvsEnumeratorHw" 2017-09-19 21:34:45 +00:00
Scott Randolph
34daf2ff7c Register mock EVS driver as EvsEnumeratorHw
This makes the mock driver (when loaded and running) serve as THE evs
driver for the system.  Facilitates VTS tests running, etc.
This driver should not run on a production system as it should have a
"real" driver registered instead.

Change-Id: I716f8f8226e7152521375b94013828a3aa2bb9f0
BUg: 65376941
Test: boot mojave, then 'ps -lef | grep evs'
2017-09-19 14:29:21 -07:00
Eino-Ville Talvala
7fccf50db2 Merge "Camera: Add default implementation of camera.device@3.3" into oc-mr1-dev am: 3f55d8735e
am: d69e27a115

Change-Id: If3fe372f0574c318fb194dcab0ea2cee4fc827ff
2017-09-19 16:01:04 +00:00
Eino-Ville Talvala
d69e27a115 Merge "Camera: Add default implementation of camera.device@3.3" into oc-mr1-dev
am: 3f55d8735e

Change-Id: Ib621684a43181bfbf8fdf020128215d326fc4fbd
2017-09-19 15:57:03 +00:00
Eino-Ville Talvala
3f55d8735e Merge "Camera: Add default implementation of camera.device@3.3" into oc-mr1-dev 2017-09-19 15:53:43 +00:00
Pawin Vongmasa
7e3570f08e Merge "Fix typos in IOmxStore.hal" into oc-mr1-dev am: 941b614064
am: 87165bb092

Change-Id: I4724699054648351683d3b139f45dab7799a30aa
2017-09-19 01:30:07 +00:00
Pawin Vongmasa
87165bb092 Merge "Fix typos in IOmxStore.hal" into oc-mr1-dev
am: 941b614064

Change-Id: I6a33f4b153859013484d4eb25b702ae4cb9c3ff2
2017-09-19 01:22:43 +00:00
TreeHugger Robot
941b614064 Merge "Fix typos in IOmxStore.hal" into oc-mr1-dev 2017-09-19 01:14:00 +00:00
TreeHugger Robot
5bb23b736b Merge "Revert "Enable SetDefaultPortParams and EOSTest_M tests"" 2017-09-18 21:54:59 +00:00
Yifan Hong
827f2d1f4e Merge "hidl_test: update expression test" am: 9dc1284388 am: eed76d6fc9 am: 23072f6c52
am: 582e21e478

Change-Id: I3473f2d4c579a4dd6a3acec4bdb3dab0a6b122a7
2017-09-18 21:02:42 +00:00
Yifan Hong
582e21e478 Merge "hidl_test: update expression test" am: 9dc1284388 am: eed76d6fc9
am: 23072f6c52

Change-Id: I854241b90ba0c4002244cc0a2071aaa2d7ecfd7d
2017-09-18 20:33:30 +00:00
Yifan Hong
23072f6c52 Merge "hidl_test: update expression test" am: 9dc1284388
am: eed76d6fc9

Change-Id: I6420540c867f0cf7e1c2aec5a33df60166680ddf
2017-09-18 20:14:32 +00:00
Yifan Hong
eed76d6fc9 Merge "hidl_test: update expression test"
am: 9dc1284388

Change-Id: I042ea91d758d170c1508d0856887d1c5bc56a08b
2017-09-18 20:09:27 +00:00
Yifan Hong
9dc1284388 Merge "hidl_test: update expression test" 2017-09-18 19:52:10 +00:00
Peng Xu
9970e2553e Merge "Add capability for sensor hal to use wakelock" into oc-mr1-dev am: 87f9ec412f
am: 5af077d7ce

Change-Id: I6f6a6a1b6d435db08c74cc25cfa9f4ad1d646566
2017-09-18 19:15:17 +00:00
Peng Xu
5af077d7ce Merge "Add capability for sensor hal to use wakelock" into oc-mr1-dev
am: 87f9ec412f

Change-Id: Ib5782a5e368ba8ddc6b2a22c01adad036320fbc4
2017-09-18 19:12:21 +00:00
Peng Xu
87f9ec412f Merge "Add capability for sensor hal to use wakelock" into oc-mr1-dev 2017-09-18 19:07:09 +00:00
Peng Xu
c1aa066b96 Merge "Add capability for sensor hal to use wakelock" am: 2adf343f57 am: b3698f066c am: 6d7dfdbe63
am: 2183769559

Change-Id: Ib0c2b8f3cb6bbc7d43625ba188760a1d9fe39e42
2017-09-18 18:59:34 +00:00
Peng Xu
2183769559 Merge "Add capability for sensor hal to use wakelock" am: 2adf343f57 am: b3698f066c
am: 6d7dfdbe63

Change-Id: I41b55798061e97756b760fed99f4a5dfeb112173
2017-09-18 18:31:31 +00:00
Peng Xu
6d7dfdbe63 Merge "Add capability for sensor hal to use wakelock" am: 2adf343f57
am: b3698f066c

Change-Id: I1d6efc60465540add24fe8808a779a77d665e7af
2017-09-18 18:19:41 +00:00
Peng Xu
b3698f066c Merge "Add capability for sensor hal to use wakelock"
am: 2adf343f57

Change-Id: I67c4c90fcba7d2f6a4ee5ea293aabc19b696e484
2017-09-18 18:18:10 +00:00
Peng Xu
2adf343f57 Merge "Add capability for sensor hal to use wakelock" 2017-09-18 18:11:58 +00:00
Pawin Vongmasa
ede52502cb Revert "Enable SetDefaultPortParams and EOSTest_M tests"
This reverts commit 42958b71b0.

Change-Id: Icf95434d0d2a647f3e3014dcec3e0c9b4279ebb0
2017-09-17 14:34:21 +00:00
Pawin Vongmasa
ed95ab31e1 Fix typos in IOmxStore.hal
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice

Bug: 65719609
Bug: 65769027
Change-Id: I44d62cd5a8aa21d9fa816d5f0bf663e943a21bb5
2017-09-16 23:10:51 -07:00
Jiyong Park
3fb028379d Merge changes from topic "hidl_for_test_aosp" am: a7603c38ac am: f78db71dae am: e9b22b6133
am: 7f344d6a66

Change-Id: Id820cbc9706c2427b3f63d5e5a25e68f86767af5
2017-09-16 01:16:31 +00:00
Jiyong Park
a8d9c9fe56 HAL interface libs for testing are built w/o VNDK. am: b5e9a6bdc3 am: 0a6419040f am: 2fdf732624 -s ours
am: c16252b49f  -s ours

Change-Id: I26386398e90ea406ef74519edef328782065cbd4
2017-09-16 01:16:25 +00:00
Jiyong Park
7f344d6a66 Merge changes from topic "hidl_for_test_aosp" am: a7603c38ac am: f78db71dae
am: e9b22b6133

Change-Id: I5b0808f926c4506e4ed0ebe1f06f80744415c6ef
2017-09-16 01:13:53 +00:00
Jiyong Park
c16252b49f HAL interface libs for testing are built w/o VNDK. am: b5e9a6bdc3 am: 0a6419040f
am: 2fdf732624  -s ours

Change-Id: I8fa654dd84e40bea203e13ab0b3be96aea6cb8fd
2017-09-16 01:13:48 +00:00
Jiyong Park
e9b22b6133 Merge changes from topic "hidl_for_test_aosp" am: a7603c38ac
am: f78db71dae

Change-Id: Ife8a39e423f3a3faa46841670899492bc4bc48ce
2017-09-16 01:11:19 +00:00
Jiyong Park
2fdf732624 HAL interface libs for testing are built w/o VNDK. am: b5e9a6bdc3
am: 0a6419040f

Change-Id: Iad2b68369e76123d42d577d06082f700a39e0106
2017-09-16 01:11:16 +00:00
Jiyong Park
f78db71dae Merge changes from topic "hidl_for_test_aosp"
am: a7603c38ac

Change-Id: I92acd703df3ed100255e63c9ec511eec3c0a97a3
2017-09-16 01:09:06 +00:00
Jiyong Park
0a6419040f HAL interface libs for testing are built w/o VNDK.
am: b5e9a6bdc3

Change-Id: Ia41d7362652a8aed5054d99dbaba79f2760a8b23
2017-09-16 01:08:58 +00:00
Treehugger Robot
a7603c38ac Merge changes from topic "hidl_for_test_aosp"
* changes:
  Mark android.hardware.tests.trie as a test HAL interface
  HAL interface libs for testing are built w/o VNDK.
2017-09-16 01:02:31 +00:00
Yifan Hong
07dd1bbcc6 hidl_test: update expression test
Add more tests to constant expressions in HIDL.
Test: m hidl_test -j
Bug: 64613737

Change-Id: I9cd2bf7bbd8b911f49784f376a0cd834561cd0c8
2017-09-15 17:46:45 -07:00
Steven Moreland
9c212e4abd Merge "Add test for fq reference to local type." am: d8d0ba281f am: 3c8833d79f am: 48028a4e8b
am: 0eebf94bf8

Change-Id: I78a02769b7009e779c09c48db8469b29a98d8bc6
2017-09-16 00:26:49 +00:00
Steven Moreland
0eebf94bf8 Merge "Add test for fq reference to local type." am: d8d0ba281f am: 3c8833d79f
am: 48028a4e8b

Change-Id: I97dbaaf6eabde1fb7947b76e4aac7090c34f3280
2017-09-16 00:24:12 +00:00
Steven Moreland
48028a4e8b Merge "Add test for fq reference to local type." am: d8d0ba281f
am: 3c8833d79f

Change-Id: I5628c5b1d8ea9e01b492a48ecaf8fe1861aaf8fb
2017-09-16 00:21:42 +00:00
Steven Moreland
3c8833d79f Merge "Add test for fq reference to local type."
am: d8d0ba281f

Change-Id: I154aba182e6939463123b5745b98ce93c410c96e
2017-09-16 00:19:31 +00:00
Treehugger Robot
d8d0ba281f Merge "Add test for fq reference to local type." 2017-09-16 00:15:56 +00:00
Peng Xu
812a98b23e Merge "Add OWNERS file for sensors" am: 9887905762 am: 9717286cde am: 667a77715c
am: 3332fc44de  -s ours

Change-Id: If05ad6e19d28f69225175c998ab3acf1fd379e07
2017-09-15 18:35:50 +00:00
Peng Xu
3332fc44de Merge "Add OWNERS file for sensors" am: 9887905762 am: 9717286cde
am: 667a77715c

Change-Id: I5cabd65e8fda9e217526e98f5a0c0900dc00838d
2017-09-15 18:14:15 +00:00
Peng Xu
667a77715c Merge "Add OWNERS file for sensors" am: 9887905762
am: 9717286cde

Change-Id: I9e4538ef2ea5ce827cc9160e86b374af904ef1d2
2017-09-15 18:10:14 +00:00
Eino-Ville Talvala
50fe430994 Camera: Add default implementation of camera.device@3.3
Inherit as much as possible from camera.device@3.2

- Refactor CameraDeviceSession@3.2 implementation to separate out the
  HIDL session interface from the main implementation object. This
  avoids multiple inheritance issues
- Create CameraDeviceSession@3.3 with support for the new
  overrideDataspace field
- Add virtual factory method for CameraDevice to create the right version
  of Session.
- Create CameraDevice@3.3, which overrides createSession to return a
  CameraDeviceSession@3.3.
- Add system property to override selection of which minor HIDL
  version is used for legal HAL version 3.x; set the default to the
  newest available minor version.

Test: Camera CTS passes on device using @3.3.
Bug: 62358514
Change-Id: I497e4bc0de798b56ecdb2ea6467b79afccaf89f7
2017-09-15 11:08:48 -07:00
Peng Xu
9717286cde Merge "Add OWNERS file for sensors"
am: 9887905762

Change-Id: I487595f1b9eade05bc8bbcb2591db2f1d2d4c0a6
2017-09-15 18:08:13 +00:00
Peng Xu
9887905762 Merge "Add OWNERS file for sensors" 2017-09-15 18:04:34 +00:00
Ashutosh Joshi
45f8871796 Add OWNERS file for sensors
Add owners file for default sensors HAL implementation and the
functional VTS tests.

Test: Build compiles
Change-Id: I54f28cb131f344d779ca34cdce027881bab5f59d
Merged-In: I54f28cb131f344d779ca34cdce027881bab5f59d
2017-09-15 18:04:12 +00:00
Etan Cohen
c11ec2f5b0 Merge "[WIFI][TREBLE] Uprev Wi-Fi HAL 1.2" 2017-09-15 13:58:43 +00:00
Jiyong Park
fa8ff37769 Merge "HAL interface libs for testing are built w/o VNDK." into oc-mr1-dev am: 3f2c1c1b1c
am: ff9184f589

Change-Id: Ic5aa5e77cf7bdd4d114647ce0104d1ea86a6b448
2017-09-15 09:24:14 +00:00
nharold
d43efc4006 Merge "Fix docstrings for RIL_CellIdentity" am: e4d5502c72 -s ours am: 9866c81a20 -s ours am: 67304e390d -s ours
am: 02e37e26ee  -s ours

Change-Id: I595180bfe3a1bab2dca8a421ba38e8691501a591
2017-09-15 09:23:36 +00:00