Commit Graph

15773 Commits

Author SHA1 Message Date
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
0639b1cc0d Merge "Add non-dds check for startNetworkScan" into qt-dev
am: 53861e16c3

Change-Id: Icdea09484bf16f01450fb3cf8734f2c013cf5052
2019-07-22 17:25:14 -07:00
Youming Ye
53861e16c3 Merge "Add non-dds check for startNetworkScan" into qt-dev 2019-07-23 00:08:37 +00:00
Amy
0fc712cba5 Merge "Adding default HDMI CEC impl" am: 42d10ce6ee am: cad5ed3fa2
am: 01a5b3e188

Change-Id: Ic138baa815d33f5f98be3ef61ce981b808447ecf
2019-07-22 14:13:48 -07:00
Amy
01a5b3e188 Merge "Adding default HDMI CEC impl" am: 42d10ce6ee
am: cad5ed3fa2

Change-Id: Ie2b8eb5575e1c84abb1dde788c256a871850459b
2019-07-22 14:04:54 -07:00
Janis Danisevskis
cee1090be5 Merge "Add localization string for confirmationui." am: 5faecb3e7d am: c573c0ad45
am: a626ef3b76

Change-Id: Ia721cfd247f3920969f773ef01f483e3ac378f24
2019-07-22 13:55:32 -07:00
Amy
cad5ed3fa2 Merge "Adding default HDMI CEC impl"
am: 42d10ce6ee

Change-Id: I40e20349695672ad34b72aff75a8611a938ac7bf
2019-07-22 13:54:53 -07:00
Treehugger Robot
42d10ce6ee Merge "Adding default HDMI CEC impl" 2019-07-22 20:45:43 +00:00
Janis Danisevskis
a626ef3b76 Merge "Add localization string for confirmationui." am: 5faecb3e7d
am: c573c0ad45

Change-Id: I6b8a68583bc312054ea691d035de425d3a51118f
2019-07-22 13:43:25 -07:00
Janis Danisevskis
c573c0ad45 Merge "Add localization string for confirmationui."
am: 5faecb3e7d

Change-Id: Ic7dbdf347d9fa1bb137ffa1a2087179808acf209
2019-07-22 13:33:26 -07:00
Treehugger Robot
5faecb3e7d Merge "Add localization string for confirmationui." 2019-07-22 20:06:11 +00:00
Anil Admal
ed6c972eb6 VTS 1.1 TestGnssMeasurementCallback test must allow 1.1 or 1.0 versions am: e16ca9abca
am: 6857687ebc

Change-Id: I66e1275a9758677fa290cbaffff3af4e4f06a457
2019-07-19 16:35:54 -07: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
Anil Admal
0fbd66c77e VTS 1.1 TestGnssMeasurementCallback test must allow 1.1 or 1.0 versions am: e16ca9abca
am: 3d32ac52ab

Change-Id: Ic115bf1ea9a57b02da54c14e98f52fd377512525
2019-07-19 16:30:40 -07:00
Anil Admal
3d32ac52ab VTS 1.1 TestGnssMeasurementCallback test must allow 1.1 or 1.0 versions
am: e16ca9abca

Change-Id: Ib5959e9d23f5490ed86ee126d7d3baaa62f5ff16
2019-07-19 16:22:45 -07:00
Anil Admal
6857687ebc VTS 1.1 TestGnssMeasurementCallback test must allow 1.1 or 1.0 versions
am: e16ca9abca

Change-Id: Ida026479cbe61592ac2a1c8540e9360acf43dffb
2019-07-19 16:21:35 -07:00
Janis Danisevskis
54243610c7 Add localization string for confirmationui.
Bug: 118818420
Test: ConfirmationUITranslations-test.c
Change-Id: I45d96dcce1d459dd889fd48c0724092e642278c2
2019-07-19 15:55:23 -07:00
Michael Butler
eed28bfa90 Update NN VTS callback objects am: 051cf39f99 am: 6fd5eaec52
am: bebab2df9b

Change-Id: I8b51ace3083c27b8a1d38cfc1843d8dc0f8059e5
2019-07-19 13:59:19 -07:00
Xusong Wang
da18072bcd Remove compiler flag for dynamic output shape tests. am: e108bc15e6 am: 237bfc9854
am: cbccbeda00

Change-Id: I4cc41d7b44cc40f00b77ad597ce3d61444213d0b
2019-07-19 13:59:01 -07:00
Slava Shklyaev
a729fdef24 Update paths to NNAPI VTS models am: cac83eefa5 am: 868ef4ac7a
am: 07353ca7f6

Change-Id: I9e7f50493580b231aa252e86d6f27657d4df9ea9
2019-07-19 13:58:45 -07:00
Slava Shklyaev
77f7ad39dd Refactor NNAPI VTS to remove unreasonable dependence between versions am: 73ee79dafa am: bc50034109
am: 92cc89a00e

Change-Id: If3615d73187bae25c729113bba8b40d457c9bd83
2019-07-19 13:56:15 -07:00
Michael Butler
bebab2df9b Update NN VTS callback objects am: 051cf39f99
am: 6fd5eaec52

Change-Id: I73d3729a8c83cca4004fff2bcff17e215a4bfbb1
2019-07-19 13:40:56 -07:00
Xusong Wang
cbccbeda00 Remove compiler flag for dynamic output shape tests. am: e108bc15e6
am: 237bfc9854

Change-Id: I8d647effee28f15e8f06a6d191f8a78d43baf9e0
2019-07-19 13:40:39 -07:00
Slava Shklyaev
07353ca7f6 Update paths to NNAPI VTS models am: cac83eefa5
am: 868ef4ac7a

Change-Id: Ie3448cbd73c464a40e5a6d3db27c8554c32ffebd
2019-07-19 13:40:28 -07:00
Slava Shklyaev
92cc89a00e Refactor NNAPI VTS to remove unreasonable dependence between versions am: 73ee79dafa
am: bc50034109

Change-Id: Ic82efc31cee662b9381a6da6b49f5b40ebae7d30
2019-07-19 13:40:20 -07:00
Michael Butler
6fd5eaec52 Update NN VTS callback objects
am: 051cf39f99

Change-Id: Ibab8657b851d56af18965766303e0f26bc51bded
2019-07-19 13:25:15 -07:00
Xusong Wang
237bfc9854 Remove compiler flag for dynamic output shape tests.
am: e108bc15e6

Change-Id: Icf4f851b0ed919f7041620d1e7a4b40ccfcbae34
2019-07-19 13:25:00 -07:00
Slava Shklyaev
868ef4ac7a Update paths to NNAPI VTS models
am: cac83eefa5

Change-Id: I72034e2205fb7a6052894271974d3bedcae71f6b
2019-07-19 13:24:44 -07:00
Slava Shklyaev
bc50034109 Refactor NNAPI VTS to remove unreasonable dependence between versions
am: 73ee79dafa

Change-Id: Ie79a5693ceb255d0e44579cc6627254840166d8f
2019-07-19 13:10:50 -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
e16ca9abca VTS 1.1 TestGnssMeasurementCallback test must allow 1.1 or 1.0 versions
Fixes: 137839372
Test: atest VtsHalGnssV1_1Target
Change-Id: Ie3b1fa8b4738c03bff7924396b5eb5c6774841f1
(cherry picked from commit 6abdaac714)
2019-07-19 18:18:16 +00:00
Anil Admal
f22b39c457 Merge "VTS 1.1 TestGnssMeasurementCallback test must allow 1.1 or 1.0 versions" into qt-r1-dev 2019-07-19 18:12:24 +00:00
Android Build Merger (Role)
6b482e782c Merge changes from topic "am-c5942e1870364b5d8a631c29be850268" into qt-r1-dev-plus-aosp
* changes:
  [automerger skipped] Merge changes from topic "FixSRGBSetColorMode_VTS_qt-dev" into qt-dev am: 818fff840a am: 66f932c583 -s ours am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history
  [automerger skipped] DO NOT MERGE: Fixing SRGB for devices that do not support SRGB color mode am: 2f3553e1ed am: c055afc896 -s ours am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history
  [automerger skipped] VTS : fix vts fail [1/1] am: 70e5b556ef am: 4818d467d7 -s ours am skip reason: change_id I5eebe5f530e3b62037d669992cf2eca0849f10be with SHA1 0d7f7882e7 is in history
2019-07-19 15:15:30 +00:00
Valerie Hau
14c8e4a59c [automerger skipped] Merge changes from topic "FixSRGBSetColorMode_VTS_qt-dev" into qt-dev am: 818fff840a
am: 66f932c583 -s ours
am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history

Change-Id: I9080e758a6a01c78399d8b88982c678f397500dc
2019-07-19 08:15:06 -07:00
Valerie Hau
278d1d780d [automerger skipped] DO NOT MERGE: Fixing SRGB for devices that do not support SRGB color mode am: 2f3553e1ed
am: c055afc896 -s ours
am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history

Change-Id: I9fa08273e63339a91107b7dbbda975fbd98d664f
2019-07-19 08:14:57 -07:00
Valerie Hau
1bd5d2520d [automerger skipped] Merge changes from topic "FixSRGBSetColorMode_VTS_qt-dev" into qt-dev am: 818fff840a -s ours
am: 7f42547069 -s ours
am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history

Change-Id: I9a94e1ff207c90ba20043e03e54b185057052cc6
2019-07-19 08:14:50 -07:00
jie.yuan
c6aedbfdc2 [automerger skipped] VTS : fix vts fail [1/1] am: 70e5b556ef
am: 4818d467d7 -s ours
am skip reason: change_id I5eebe5f530e3b62037d669992cf2eca0849f10be with SHA1 0d7f7882e7 is in history

Change-Id: I5dfa2cf7c0889e58c175fffa4eb0e3e9007419d0
2019-07-19 08:14:50 -07:00
Valerie Hau
66f932c583 Merge changes from topic "FixSRGBSetColorMode_VTS_qt-dev" into qt-dev
am: 818fff840a

Change-Id: I9c9495e9b3f0d6dfcd890364ea94092a3c534110
2019-07-19 08:09:16 -07:00
Valerie Hau
c055afc896 DO NOT MERGE: Fixing SRGB for devices that do not support SRGB color mode
am: 2f3553e1ed

Change-Id: Ibd4517cb5e5826a855840ff2259316a5177b779a
2019-07-19 08:09:13 -07:00
jie.yuan
4818d467d7 VTS : fix vts fail [1/1]
am: 70e5b556ef

Change-Id: I2adf8b4ee2afe09e578749c0f772e4a5a1e8ae6c
2019-07-19 08:09:04 -07:00
Valerie Hau
7f42547069 [automerger skipped] Merge changes from topic "FixSRGBSetColorMode_VTS_qt-dev" into qt-dev
am: 818fff840a -s ours
am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history

Change-Id: I78053cd905db78c02ea6848a4b0fc9fb3d619b3c
2019-07-19 08:08:48 -07:00
Valerie Hau
818fff840a Merge changes from topic "FixSRGBSetColorMode_VTS_qt-dev" into qt-dev
* changes:
  DO NOT MERGE: Fixing SRGB for devices that do not support SRGB color mode
  VTS : fix vts fail [1/1]
2019-07-19 14:49:44 +00:00
Michael Butler
051cf39f99 Update NN VTS callback objects
The VTS Callback files are a subset of the Callback files in
frameworks/ml/nn/runtime/Callbacks.*. This CL syncs the implementations,
removing the functionality that is not needed in VTS.

Fixes: 132322149
Test: mma
Test: VtsHalNeuralnetworksV1_0TargetTest
Test: VtsHalNeuralnetworksV1_1TargetTest
Test: VtsHalNeuralnetworksV1_2TargetTest
Change-Id: I114ce7f3b6c3d58de0196e9508209614d0a73e11
Merged-In: I114ce7f3b6c3d58de0196e9508209614d0a73e11
(cherry picked from commit 23d0e562e0)
2019-07-19 14:00:40 +01:00
Xusong Wang
e108bc15e6 Remove compiler flag for dynamic output shape tests.
Having separate VTS models and tests for difference HAL version. This
compiler flag is no longer needed.

Bug: 122740334
Test: All VTS 1.x and 1.xCompat1.y
Change-Id: Idbd96a954da9bd5a0e0e66afd9120d84a1efc784
Merged-In: Idbd96a954da9bd5a0e0e66afd9120d84a1efc784
(cherry picked from commit 7763d53545)
2019-07-19 14:00:38 +01:00
Slava Shklyaev
cac83eefa5 Update paths to NNAPI VTS models
See change If3bfbdfa016cd32a39b8a63028481da7318d6e02

Bug: 124040454
Test: VtsHalNeuralnetworksV1_0TargetTest
Test: VtsHalNeuralnetworksV1_1TargetTest
Test: VtsHalNeuralnetworksV1_1CompatV1_0TargetTest
Test: VtsHalNeuralnetworksV1_2TargetTest
Test: VtsHalNeuralnetworksV1_2CompatV1_0TargetTest
Test: VtsHalNeuralnetworksV1_2CompatV1_1TargetTest
Change-Id: I17dd4377ee5110ac10ae8142fa7403329eda067c
Merged-In: I17dd4377ee5110ac10ae8142fa7403329eda067c
(cherry picked from commit 8226861489)
2019-07-19 14:00:35 +01:00
Slava Shklyaev
73ee79dafa Refactor NNAPI VTS to remove unreasonable dependence between versions
To make it easier to create the next version of NNAPI, this change
removes the following nonsensical dependence:
- NNAPI 1.0 VTS depends on NNAPI 1.1 and 1.2
- NNAPI 1.1 VTS depends on NNAPI 1.2

In particular, I made the following changes:
- split GeneratedTestHarness.cpp into three separate implementations,
- created a restricted version of Callbacks.h for 1.0 and 1.1,
- removed the dependency on frameworks/ml/nn/HalInterfaces.h,
- refactored Android.bp files for more autonomy between 1.0, 1.1, and 1.2,
- consolidated some common code into Utils.h,
- created structure for sharing code between VTS versions (VtsHalNeuralNetworksV1_0_utils).

Bug: 74827824
Bug: 124462414
Test: VtsHalNeuralnetworksV1_0TargetTest
Test: VtsHalNeuralnetworksV1_1TargetTest
Test: VtsHalNeuralnetworksV1_1CompatV1_0TargetTest
Test: VtsHalNeuralnetworksV1_2TargetTest
Test: VtsHalNeuralnetworksV1_2CompatV1_0TargetTest
Test: VtsHalNeuralnetworksV1_2CompatV1_1TargetTest
Change-Id: I4243d0b5e574255cef1070850f4d0a284f65f54e
Merged-In: I4243d0b5e574255cef1070850f4d0a284f65f54e
(cherry picked from commit 1d6b465997)
2019-07-19 14:00:29 +01: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
Android Build Merger (Role)
6d3de0896e Merge "Merge "hostapd(vts): Add a property for SAP interface" into qt-dev am: 896c71a7d2 am: 354c2c6c55" into qt-r1-dev-plus-aosp 2019-07-19 01:30:17 +00:00
Roshan Pius
aaaf428e68 Merge "hostapd(vts): Add a property for SAP interface" into qt-dev am: 896c71a7d2
am: 3e01cbd710

Change-Id: If9310911a09d7a46aea6456e334e7c9a9c306581
2019-07-18 18:29:58 -07:00
Roshan Pius
55e2045f6e Merge "hostapd(vts): Add a property for SAP interface" into qt-dev am: 896c71a7d2
am: 354c2c6c55

Change-Id: I748c37355c90682b18369fffaedaff5eeaa0b568
2019-07-18 18:29:58 -07:00