Android Build Merger (Role)
e712d647f1
Merge "Merge "Camera: fix various VTS issues" into oc-dr1-dev am: 5311547c05 am: fb5c49990f -s ours" into oc-mr1-dev-plus-aosp
2017-07-27 23:33:18 +00:00
Yin-Chia Yeh
7e7da9c3a2
Merge "Camera: fix various VTS issues" into oc-dr1-dev am: 5311547c05
...
am: fb5c49990f
2017-07-27 23:28:29 +00:00
Yin-Chia Yeh
41703e5518
Merge "Camera: fix various VTS issues" into oc-dr1-dev am: 5311547c05 -s ours
...
am: 74fcad94f1
2017-07-27 23:25:16 +00:00
Yin-Chia Yeh
74fcad94f1
Merge "Camera: fix various VTS issues" into oc-dr1-dev
...
am: 5311547c05
2017-07-27 23:17:52 +00:00
Yin-Chia Yeh
fb5c49990f
Merge "Camera: fix various VTS issues" into oc-dr1-dev
...
am: 5311547c05
2017-07-27 23:17:45 +00:00
Yin-Chia Yeh
5311547c05
Merge "Camera: fix various VTS issues" into oc-dr1-dev
2017-07-27 23:08:56 +00:00
Yin-Chia Yeh
db11779c7e
Merge "Camera: reset callback after test done" into oc-mr1-dev
...
am: d17bb31a0d
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
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
Yin-Chia Yeh
ffb4bf7d49
Merge "Camera: add camera owners" into oc-mr1-dev
...
am: b79e079219
2017-07-27 21:07:28 +00:00
TreeHugger Robot
b79e079219
Merge "Camera: add camera owners" into oc-mr1-dev
2017-07-27 20:51:42 +00:00
Tomasz Wasilczyk
253437c905
Merge "Fix remaining broadcastradio 1.1 VTS TODOs." into oc-mr1-dev
...
am: 0beea0df7d
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
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
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
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
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
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
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
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
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
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
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
2017-07-26 19:56:55 +00:00
Zhuoyao Zhang
a2559baa62
resolve merge conflicts of 8d92561 to oc-mr1-dev
...
am: a27606b640
2017-07-26 19:49:58 +00:00
Zhuoyao Zhang
fb28df0233
resolve merge conflicts of 8d92561 to oc-mr1-dev
...
am: 9ff0bb218b
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
2017-07-26 18:30:58 +00:00
Ying Xu
d9cdb2181d
Merge "Fix VTS errors of the network scan API" into oc-dr1-dev
...
am: 6bba7c9ca4
2017-07-26 18:14:56 +00: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
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
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
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
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
2017-07-26 03:22:04 +00:00
Zhuoyao Zhang
304ba05feb
Move android.hardware.tests.msgq@1.0-impl to system.img
...
am: 2d2b64e241
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
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
yinxu
03c6b592c1
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.
Test: Telephony sanity tests, run vts -m VtsHalRadioV1_1Target
Bug: 63914600
Change-Id: I965ee6422aaa5e02bf67466f5288b808183f1738
2017-07-25 15:15:52 -07:00
Enrico Granata
e371a4c8b0
Merge "Remove unnecessary whitespace from enum members in OBD2 properties" into oc-mr1-dev
...
am: 87a14154a9
2017-07-25 21:38:36 +00:00
Eino-Ville Talvala
84ce3d51d7
Merge "Camera: Don't enforce result metadata queue support" into oc-dev am: 1d1b503b77 -s ours am: 6447e22219 -s ours
...
am: 8ee53284fd
2017-07-25 21:30:23 +00:00
