Michael Butler
4745a3d96e
NNAPI VTS fix from NNAPI CL: Cleanup HalInterfaces.h
...
Prior to this CL, HalInterfaces.h polluted the global namespace through
the "using" declarations. To fix b/72880287, those names were put in a
new ::android::nn::hal namespace. This CL fixes the compilation errors
that occur due to this cleanup.
Bug: 72880287
Test: mma
Change-Id: Idb228e37615af7c0343a09f9a51de378e63bdb5a
2019-07-17 21:25:37 +00:00
Slava Shklyaev
f3c815b300
Merge "Update paths to NNAPI VTS models"
2019-07-11 10:27:25 +00:00
Xin Li
65653b4a09
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: c158dbcd7e -s ours am: c1735a08fc -s ours am: a8f494ed86
...
am: 3ba5f9c57c -s ours
am skip reason: subject contains skip directive
Change-Id: Iee7e0305a4593e85bc060759a2b820f382b63f2e
2019-07-11 00:00:48 -07:00
Xin Li
3ba5f9c57c
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: c158dbcd7e -s ours am: c1735a08fc -s ours
...
am: a8f494ed86
Change-Id: I88c7273f2cbc411cf91a312b9801cb54b12b8a62
2019-07-10 23:25:02 -07:00
Xin Li
b3fa229edc
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 1942f9edaa -s ours am: ca1dc55195 -s ours am: 34ea7678b6
...
am: 917a5dfab5 -s ours
am skip reason: subject contains skip directive
Change-Id: Id70945bd26e5ecb5ac00ad92afcd3f4274098cf8
2019-07-10 23:24:55 -07:00
Xin Li
a8f494ed86
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: c158dbcd7e -s ours
...
am: c1735a08fc -s ours
am skip reason: subject contains skip directive
Change-Id: I5a5dde3985938542f3072f2ce8a0bd12743c28be
2019-07-10 23:02:22 -07:00
Xin Li
c1735a08fc
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
...
am: c158dbcd7e -s ours
am skip reason: subject contains skip directive
Change-Id: I4a778e54affd0885d580a9fafb49339280177e96
2019-07-10 22:56:07 -07:00
Xin Li
917a5dfab5
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 1942f9edaa -s ours am: ca1dc55195 -s ours
...
am: 34ea7678b6
Change-Id: I275711c79074feb21b40347a6f91920a6beb2f38
2019-07-10 22:50:52 -07:00
Xin Li
34ea7678b6
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 1942f9edaa -s ours
...
am: ca1dc55195 -s ours
am skip reason: subject contains skip directive
Change-Id: I5b865ce2267da55953b8f91412840750cc7261e0
2019-07-10 22:14:43 -07:00
Xin Li
ca1dc55195
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
am: 1942f9edaa -s ours
am skip reason: subject contains skip directive
Change-Id: Ib7d7f3d8de0d980428d680f02128a091f5c25fb8
2019-07-10 21:21:29 -07:00
Treehugger Robot
c158dbcd7e
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
2019-07-11 03:52:58 +00:00
Amy Zhang
97d15479e1
Merge "Add an xsd file for Short Audio Descriptor xml config file."
2019-07-10 00:38:21 +00:00
Xin Li
1942f9edaa
DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
Bug: 136196576
Change-Id: I58505f104075c7c210612eda8e266df9e3ecfeda
2019-07-09 15:22:03 -07:00
TreeHugger Robot
84c05f3c86
Merge "Fix the name of the constant for device [dis]connect parameter"
2019-07-09 21:48:12 +00:00
Amy
d365e2b5ff
Add an xsd file for Short Audio Descriptor xml config file.
...
Please see platform/device/*/files/sadConfigSample.xml as a sample XML.
Test: xmllint --noout --schema hardware/interfaces/tv/cec/1.0/config/sadConfig.xsd --xinclude device/harman/atom/files/sadConfig.xml
Bug: 80297701
Change-Id: Ic69aff4f480a206f86ef0c345b6d3f7eb87e8c1f
(cherry picked from commit 652af560cd420107b7eb5eac2307e3b53f4294a9)
2019-07-09 21:14:52 +00:00
Robin Lee
c065b11f14
Add default to IConsumerIr interface's initrc am: 3aa02c5d87 am: 50a880136a am: 95afe2bb77
...
am: d934e4fa95
Change-Id: I35e7398464d99d4960c41677a079e916726a5ea6
2019-07-09 13:12:52 -07:00
Robin Lee
d934e4fa95
Add default to IConsumerIr interface's initrc am: 3aa02c5d87 am: 50a880136a
...
am: 95afe2bb77
Change-Id: Ida0f095f8f485063eb39f6e7e07d65d4c67fee41
2019-07-09 12:33:31 -07:00
Robin Lee
95afe2bb77
Add default to IConsumerIr interface's initrc am: 3aa02c5d87
...
am: 50a880136a
Change-Id: I81f832ff0d40e7ed6bd63de588a488a8a4a6da91
2019-07-09 12:22:32 -07:00
Robin Lee
50a880136a
Add default to IConsumerIr interface's initrc
...
am: 3aa02c5d87
Change-Id: Ia27a971884c46a270373b8ecadd4f8465f2662db
2019-07-09 12:11:34 -07:00
Pawin Vongmasa
8c0dc4b1cc
Merge "Support IMapper@3.0 in OMX VTS" into qt-dev am: 56e9dd901e am: 72a92733e8
...
am: e5af6c8605
Change-Id: I0c01283a73c4fdbc8bcfde17dec5a918e5fe1149
2019-07-09 11:39:19 -07:00
Pawin Vongmasa
47cbd35cc7
Merge "Support IMapper@3.0 in OMX VTS" into qt-dev am: 56e9dd901e am: fe4f9ebb45
...
am: 8525533aa3
Change-Id: Ib3f4ad0ef4e1c76ec0499698c73d4ee36299a5e7
2019-07-09 11:31:07 -07:00
Pawin Vongmasa
e5af6c8605
Merge "Support IMapper@3.0 in OMX VTS" into qt-dev am: 56e9dd901e
...
am: 72a92733e8
Change-Id: I2d21ab6008eed4d3459d1c5f272bce4d80300b11
2019-07-09 11:29:23 -07:00
Pawin Vongmasa
8525533aa3
Merge "Support IMapper@3.0 in OMX VTS" into qt-dev am: 56e9dd901e
...
am: fe4f9ebb45
Change-Id: I6e0dd790ac8c113b21bfa039cae9bab1a0d22d45
2019-07-09 11:17:26 -07:00
Pawin Vongmasa
fe4f9ebb45
Merge "Support IMapper@3.0 in OMX VTS" into qt-dev
...
am: 56e9dd901e
Change-Id: I5f05c76194a5a29aa31216dd06a85b82a6ca7539
2019-07-09 11:06:26 -07:00
Pawin Vongmasa
72a92733e8
Merge "Support IMapper@3.0 in OMX VTS" into qt-dev
...
am: 56e9dd901e
Change-Id: I264ef276b7e464f56e9b93df13cd8618eddc66bc
2019-07-09 11:05:26 -07:00
TreeHugger Robot
56e9dd901e
Merge "Support IMapper@3.0 in OMX VTS" into qt-dev
2019-07-09 17:25:39 +00:00
Robin Lee
3aa02c5d87
Add default to IConsumerIr interface's initrc
...
Fixes build for devices using this interface.
$ ./out/host/linux-x86/bin/host_init_verifier
-p $OUT/obj/ETC/passwd_intermediates/passwd
-k out/soong/.intermediates/known_hidl_interfaces.txt
hardware/interfaces/ir/1.0/default/android.hardware.ir@1.0-service.rc
>> host_init_verifier:
>>>> hardware/interfaces/ir/1.0/default/android.hardware.ir@1.0-service.rc:
>>>> 2: interface requires 2 arguments
>> host_init_verifier: Failed to parse init script
>> 'hardware/interfaces/ir/1.0/default/android.hardware.ir@1.0-service.rc'
>>>> with 1 errors
Test: make dist # fails before change, passes after
Change-Id: Ia23b855424905c465fa4ee13f8910aa47d194899
2019-07-09 12:14:31 +00:00
Pawin Vongmasa
94a3234219
Support IMapper@3.0 in OMX VTS
...
Test: vts-tradefed run vts -m VtsHalMediaOmxV1_0Host
Bug: 135422812
Change-Id: I9a37b4f926813b0cd90f96e318760eecafd04e06
2019-07-08 21:31:33 -07:00
zhangweiwei
3443f6624b
Camera: Vts: Fix missing session close am: d21dd860ce am: 235e9b03e2
...
am: 68f4ecc6d6
Change-Id: I7e2862e8ab9bf0070a48ec34572706f685f460f6
2019-07-08 18:31:57 -07:00
zhangweiwei
68f4ecc6d6
Camera: Vts: Fix missing session close am: d21dd860ce
...
am: 235e9b03e2
Change-Id: Iee1671fd059653ddea76667cbbfdd45484e870a1
2019-07-08 17:58:23 -07:00
zhangweiwei
c55beb3a4a
Camera: Vts: Fix missing session close am: d21dd860ce am: 7e49059a05
...
am: c8ce2b26b1
Change-Id: I3f5c69e1f0e7876c15d46e6fe71dd37c860f51d2
2019-07-08 17:53:37 -07:00
zhangweiwei
c8ce2b26b1
Camera: Vts: Fix missing session close am: d21dd860ce
...
am: 7e49059a05
Change-Id: Iac501001a108f60f7734d5e0a0076d0aa95b49aa
2019-07-08 17:33:17 -07:00
zhangweiwei
235e9b03e2
Camera: Vts: Fix missing session close
...
am: d21dd860ce
Change-Id: I402a964794392ee6c4233241ce97a369b3b93781
2019-07-08 17:14:33 -07:00
zhangweiwei
7e49059a05
Camera: Vts: Fix missing session close
...
am: d21dd860ce
Change-Id: I9123734328af0b696926b446a19d9602ba7f9d60
2019-07-08 17:11:10 -07:00
android-build-team Robot
0ef08c828d
Snap for 5622519 from b095226d92 to pi-platform-release
...
Change-Id: Ica34e89bfee2be3a58c1a0a251bd43ed9adf534b
2019-07-08 23:25:45 +00:00
Mikhail Naganov
98f2715168
Fix the name of the constant for device [dis]connect parameter
...
During the transition to Treble, "device connect" / "disconnect"
parameter was erroneously attributed to audio streams. This
issue got fixed in Audio HAL V4.0, but AudioParameter file
was still using incorrect name for the constant.
Test: make
Change-Id: I18e1e3fccad3d41372f3c5c046af4f6ffd83328b
2019-07-08 15:29:33 -07:00
Felix
84af4f6e7e
Merge "Add interface info to .rc files" am: 98d0f4d52c am: 37298a7616 am: 3531ec0183
...
am: bf481c99ed
Change-Id: Ie44e2aa87f7407a9820dc6f1ad6298b61bae34f3
2019-07-08 12:57:01 -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
3531ec0183
Merge "Add interface info to .rc files" am: 98d0f4d52c
...
am: 37298a7616
Change-Id: Ib279bd04cbdf030104d077b9a2a836a348322476
2019-07-08 12:31:38 -07:00
Felix
37298a7616
Merge "Add interface info to .rc files"
...
am: 98d0f4d52c
Change-Id: Ie6cfbacd523c4b09f77bee3369ec8e88b3fa0419
2019-07-08 12:22:23 -07:00
Treehugger Robot
98d0f4d52c
Merge "Add interface info to .rc files"
2019-07-08 18:56:33 +00:00
zhangweiwei
d21dd860ce
Camera: Vts: Fix missing session close
...
Test: vendor testing, Camera VTS on Pixel
Bug:135898951
Change-Id: I61f5a90d62732a00d0bc9abad05db0a1a9cc2b63
2019-07-08 08:45:18 -07:00
Willy Hu
b04cc8c52c
Merge "VTS: Change stopNetworkScan from 1_1 to 1_2" into qt-r1-dev am: 1b1c6e42c9
...
am: 39c6e3a9e7
Change-Id: Id41b727f96f78ab127d0ae71b4fe4510c69d466c
2019-07-04 04:48:54 -07:00
Willy Hu
39c6e3a9e7
Merge "VTS: Change stopNetworkScan from 1_1 to 1_2" into qt-r1-dev
...
am: 1b1c6e42c9
Change-Id: I81d68cbcbe396ef50e224fc691acc568b0247670
2019-07-04 04:40:22 -07:00
TreeHugger Robot
1b1c6e42c9
Merge "VTS: Change stopNetworkScan from 1_1 to 1_2" into qt-r1-dev
2019-07-04 11:20:16 +00:00
Slava Shklyaev
5379aaf91b
Merge "Refactor NNAPI VTS to remove unreasonable dependence between versions"
2019-07-04 09:44:47 +00:00
Jordan Liu
4d2509f1f0
[automerger skipped] Merge "Add radio config 1.2 VTS tests" am: fbd3b6cec4 -s ours am: dca7ba4b34 -s ours am: 8991d42944 -s ours
...
am: 50f2d028d8 -s ours
am skip reason: change_id Ib4fc17ea9f76caaf0cb0d4a2914595b7cfb7b041 with SHA1 1297854120 is in history
Change-Id: Idfde06c53257b3f61f0457574018088ff4c8da8f
2019-07-03 22:03:16 -07:00
sqian
0507ffd9fa
[automerger skipped] Hang up EmergencyDial after Trigger in VTS am: 8c9947de8d am: 1ade5556c8 -s ours am: 569d83c476 -s ours
...
am: 07cb042c1e -s ours
am skip reason: change_id Iecba54b93b96d33b57bc59e00f082ff133d2e57b with SHA1 07a53471c4 is in history
Change-Id: Id020bbd9044fd5e52284a9da8254ad96cb208bf2
2019-07-03 22:02:51 -07:00
Jordan Liu
50f2d028d8
[automerger skipped] Merge "Add radio config 1.2 VTS tests" am: fbd3b6cec4 -s ours am: dca7ba4b34 -s ours
...
am: 8991d42944 -s ours
am skip reason: change_id Ib4fc17ea9f76caaf0cb0d4a2914595b7cfb7b041 with SHA1 15df27e428 is in history
Change-Id: I97ebd5173b8699bc59d9e837412e44ff3dc05caa
2019-07-03 20:04:53 -07:00
sqian
07cb042c1e
[automerger skipped] Hang up EmergencyDial after Trigger in VTS am: 8c9947de8d am: 1ade5556c8 -s ours
...
am: 569d83c476 -s ours
am skip reason: change_id Iecba54b93b96d33b57bc59e00f082ff133d2e57b with SHA1 b2e7c71f39 is in history
Change-Id: I08deda555e8fc2fea5a606ea2fcdce3097d42bfa
2019-07-03 20:02:17 -07:00