Yin-Chia Yeh
02a41621ff
Merge "Camera: reset callback after test done" into oc-dev am: 72ff9a1e38
-s ours
...
am: e2f3270db5
-s ours
Change-Id: I892b86fc36cf4e60dbfa7b00b383cb93c5a85d13
2017-08-02 01:58:38 +00:00
sqian
9f103257c4
resolve merge conflicts of 345a396c
to oc-dr1-dev
...
am: a6e57a9647
-s ours
Change-Id: Idc6b4412e4f2548d1635136a52f93ff1bdbea4a9
2017-08-02 01:58:04 +00:00
Yin-Chia Yeh
04eab47d94
Merge "Camera: reset callback after test done" into oc-dev am: 72ff9a1e38
...
am: e31ea3ab65
-s ours
Change-Id: I0860c4dfaf348c4e44696e7ff3b0717c9f99797b
2017-08-02 01:43:02 +00:00
Yin-Chia Yeh
e2f3270db5
Merge "Camera: reset callback after test done" into oc-dev
...
am: 72ff9a1e38
-s ours
Change-Id: I4cf59eaf2e9583af574d50f9ddb830eb34e3356d
2017-08-02 01:19:33 +00:00
sqian
9a73da9161
resolve merge conflicts of 140b84b3
to oc-dr1-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia06246656aa4ef9db0b68942402ea0264fb92b17
Merged-In: I9200fb932032e6e23a5f4401fa5698140a278d07
2017-08-02 01:11:38 +00:00
Yin-Chia Yeh
e31ea3ab65
Merge "Camera: reset callback after test done" into oc-dev
...
am: 72ff9a1e38
Change-Id: I194688afcf1143f7ac40416150986cd8e4ad02aa
2017-08-01 22:05:24 +00:00
TreeHugger Robot
72ff9a1e38
Merge "Camera: reset callback after test done" into oc-dev
2017-08-01 21:40:35 +00:00
sqian
a6e57a9647
resolve merge conflicts of 345a396c
to oc-dr1-dev
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5d816e17b2c8b113d07bf5e827d8c9378af761d9
Merged-In: I5d816e17b2c8b113d07bf5e827d8c9378af761d9
2017-08-01 12:25:53 -07:00
Shuo Qian
140b84b377
Merge "Add EMPTY_RECORD for getDeviceIdentity" into oc-dev
...
am: 345a396c18
Change-Id: I1188659709dfa1bf475375a4fbbcb6258d5d991c
2017-08-01 18:00:48 +00:00
Shuo Qian
345a396c18
Merge "Add EMPTY_RECORD for getDeviceIdentity" into oc-dev
2017-08-01 17:55:32 +00:00
sqian
67901bf2ce
Add EMPTY_RECORD for getDeviceIdentity
...
Remove same unit test case with arguments "","0" for:
- sendEnvelope
- sendTerminalResponseToSim
- sendEnvelopeWithStatus
Test: verified by vendor, treehuger
Bug: 62926561
Change-Id: I5f535bdfc5821275a7ea2571d411374e0d7a8822
Merged-In: I5f535bdfc5821275a7ea2571d411374e0d7a8822
2017-07-31 17:56:36 -07:00
Android Build Merger (Role)
ba1ac6f722
Merge "Merge "Add corresponding error code to fix vts test" into oc-dev am: 417af3a797
am: 2ad5aecc2e
-s ours" into oc-dr1-dev-plus-aosp
2017-08-01 00:28:06 +00:00
Shuo Qian
7097592d46
Merge "Add corresponding error code to fix vts test" into oc-dev am: 417af3a797
...
am: 2ad5aecc2e
-s ours
Change-Id: I20dcbef58dfb44fd1100c37f41eeb77be24ea9af
2017-08-01 00:27:53 +00:00
Shuo Qian
ce28abe7ed
Merge "Add corresponding error code to fix vts test" into oc-dev am: 417af3a797
-s ours
...
am: ec37054b9e
-s ours
Change-Id: If8e124e4ea27e6d61a02fd594352d451f72140a2
2017-08-01 00:27:52 +00:00
Shuo Qian
2ad5aecc2e
Merge "Add corresponding error code to fix vts test" into oc-dev
...
am: 417af3a797
Change-Id: I39238ce6a796bc6981b77ec361f384f0f3f4d173
2017-08-01 00:25:23 +00:00
Shuo Qian
ec37054b9e
Merge "Add corresponding error code to fix vts test" into oc-dev
...
am: 417af3a797
-s ours
Change-Id: I98205a431af725626f8f692d9b69d4c4c1f6fe5b
2017-08-01 00:25:20 +00:00
Shuo Qian
1e6c18c334
Merge "Add corresponding error code to fix vts test" into oc-dr1-dev
...
am: a20caf7720
-s ours
Change-Id: I47d667239c7a699d3b77a42ebbf08c5cd12f90ac
2017-08-01 00:25:20 +00:00
Shuo Qian
417af3a797
Merge "Add corresponding error code to fix vts test" into oc-dev
2017-08-01 00:19:48 +00:00
Shuo Qian
a20caf7720
Merge "Add corresponding error code to fix vts test" into oc-dr1-dev
2017-08-01 00:19:33 +00:00
Android Build Merger (Role)
b89ca18b38
Merge "Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev am: 90e68d31cf
am: 3f60c009dc" into oc-dr1-dev-plus-aosp
2017-08-01 00:09:02 +00:00
Kevin Rocard
352070c11e
Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev am: 90e68d31cf
...
am: e93e38a91d
Change-Id: Ibf5b6c05c340d7ae423ab0149067b4db58ff6c97
2017-08-01 00:08:46 +00:00
Kevin Rocard
f4410ca6c0
Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev am: 90e68d31cf
...
am: 3f60c009dc
Change-Id: Ibf84197428ce6fd98224135107ddefa58786b8ad
2017-08-01 00:08:46 +00:00
Kevin Rocard
3f60c009dc
Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev
...
am: 90e68d31cf
Change-Id: Iadee05e91ad122c99b3d33b92c47b6fbcc27f2af
2017-08-01 00:05:16 +00:00
Kevin Rocard
e93e38a91d
Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev
...
am: 90e68d31cf
Change-Id: I0aa31b2996c8aae97d0b7ba16d9943f47d70a1fe
2017-08-01 00:05:16 +00:00
TreeHugger Robot
90e68d31cf
Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev
2017-07-31 23:56:02 +00:00
sqian
293bbfdc3e
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-31 15:00:44 -07:00
Sohani Rao
c17e286b9f
Merge "Wifi Offload HAL: Improve VTS tests for scanConfig" into oc-dr1-dev
...
am: cf43256fa9
Change-Id: I6dc1e8402c30a15f53273d059231b33d958eee4e
2017-07-31 19:59:29 +00:00
TreeHugger Robot
cf43256fa9
Merge "Wifi Offload HAL: Improve VTS tests for scanConfig" into oc-dr1-dev
2017-07-31 19:52:44 +00:00
Steven Moreland
a1a7a39695
Merge "Update HIDL makefiles." am: 49dad304a5
am: 68a25d22e3
...
am: 27e608f01c
Change-Id: I1d9c2c1d1b15f865890f3c11310abd4096497ff5
2017-07-31 19:40:02 +00:00
Steven Moreland
27e608f01c
Merge "Update HIDL makefiles." am: 49dad304a5
...
am: 68a25d22e3
Change-Id: I98400033b6e49696bc27930153a6747665235a98
2017-07-31 19:36:37 +00:00
Steven Moreland
68a25d22e3
Merge "Update HIDL makefiles."
...
am: 49dad304a5
Change-Id: I29f1de44312f589ba6e1df9498809cbb31315a2b
2017-07-31 19:33:34 +00:00
Treehugger Robot
49dad304a5
Merge "Update HIDL makefiles."
2017-07-31 19:25:11 +00:00
Android Build Merger (Role)
686b08f4bc
Merge "Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev am: 456dc6cc86
am: 39e2d42dcb
-s ours" into oc-dr1-dev-plus-aosp
2017-07-31 16:31:36 +00:00
Emilian Peev
0a43eddebd
Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev am: 456dc6cc86
-s ours
...
am: 7bf57e857b
-s ours
Change-Id: If42e70eb0da24fcb91011bdf8014d4f323e86aea
2017-07-31 16:31:15 +00:00
Emilian Peev
d810d69c51
Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev am: 456dc6cc86
...
am: 39e2d42dcb
-s ours
Change-Id: Ie86915af1be6fa0a394f85f058b9a0006296b1d8
2017-07-31 16:31:15 +00:00
Emilian Peev
39e2d42dcb
Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev
...
am: 456dc6cc86
Change-Id: I2101aa5931f85f78f19e35922bdecfabd4687c65
2017-07-31 16:28:17 +00:00
Emilian Peev
9a63e83ca2
Merge "Camera: Update stream consumer usage flag" into oc-dr1-dev
...
am: 48e25765d1
Change-Id: I1a606bafa515b7dd494a508be426473e412416b7
2017-07-31 16:28:17 +00:00
Emilian Peev
7bf57e857b
Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev
...
am: 456dc6cc86
-s ours
Change-Id: I10d00cc7a42127f5235a97dc72f76e608dfb5fea
2017-07-31 16:28:15 +00:00
TreeHugger Robot
456dc6cc86
Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev
2017-07-31 16:22:23 +00:00
TreeHugger Robot
48e25765d1
Merge "Camera: Update stream consumer usage flag" into oc-dr1-dev
2017-07-31 16:21:44 +00:00
Android Build Merger (Role)
43c83f070b
Merge "Camera: fix various VTS issues am: a0dd95d45d
am: d42258ea80
-s ours" into oc-dr1-dev-plus-aosp
2017-07-31 08:58:58 +00:00
Yin-Chia Yeh
bf1bb54442
Camera: fix various VTS issues am: a0dd95d45d
-s ours
...
am: 63a9a98152
-s ours
Change-Id: I489827b75dfe1594de0ef6b1ea0eaaa9198ff634
2017-07-31 08:58:46 +00:00
Yin-Chia Yeh
fdce970ef8
Camera: fix various VTS issues am: a0dd95d45d
...
am: d42258ea80
-s ours
Change-Id: Icb4a20c1c5b88bf8fd465a8ed13e6c519a72e583
2017-07-31 08:58:45 +00:00
Yin-Chia Yeh
d42258ea80
Camera: fix various VTS issues
...
am: a0dd95d45d
Change-Id: I1fe7b8e4e17af70776f197ea25ecdd4281c34e5c
2017-07-31 08:55:46 +00:00
Yin-Chia Yeh
63a9a98152
Camera: fix various VTS issues
...
am: a0dd95d45d
-s ours
Change-Id: Ib438269494c5c25f1759f7ec016cbca97bec9072
2017-07-31 08:55:46 +00:00
Emilian Peev
d9a7d3cd95
NO PARTIAL RERUN 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-31 09:36:56 +01:00
Nathan Harold
6157929382
RadioV1_1 VTS Tests: startKeepalive, stopKeepalive
...
am: 64aae865f0
Change-Id: Ib385b12f79b924ab30c626fc404e78348ca77d79
2017-07-29 01:03:04 +00:00
yinxu
26b6ae64fa
Fix VTS errors of the network scan API am: 0e9094142f
am: 6d9952a70b
...
am: 938f095f7f
-s ours
Change-Id: Ie6a3a04ed5a16d7a332a606b1debec5c3f2fd6f0
2017-07-28 22:21:54 +00:00
yinxu
938f095f7f
Fix VTS errors of the network scan API am: 0e9094142f
...
am: 6d9952a70b
Change-Id: I2446c7eab4b2bea0bf4f8e280615d2526a8920a2
2017-07-28 22:16:54 +00:00
yinxu
6d9952a70b
Fix VTS errors of the network scan API
...
am: 0e9094142f
Change-Id: Ic3620579f9d428da82f612c71c039336f791ca2d
2017-07-28 22:13:26 +00:00