Ryan Campbell
ee2cc179cd
Convert android.hardware.light@2.0 to soong.
...
Convert both the *-impl.so and the *-service to be built with Soong
instead of make.
Test: cd hardware/interfaces/light && mma -j60
Bug: 37512442
Change-Id: I15c4779a7c9eea39fb20746f69800dcf20670275
2017-07-27 10:39:14 -07:00
Yin-Chia Yeh
985907ae0b
Merge "Camera: reset callback after test done" into oc-dr1-dev am: eba1407b55 am: 6277952f30 -s ours
...
am: cb3c3a52ef -s ours
Change-Id: I1999e74cd8a2d3469c3038166c20df1716e6db22
2017-07-27 04:48:12 +00:00
Yin-Chia Yeh
fa4bdb30f3
Merge "Camera: reset callback after test done" into oc-dr1-dev am: eba1407b55 -s ours am: 8d1ef0505f
...
am: 6e9018e807 -s ours
Change-Id: Iba963028578a82ca01322552a284db16845edac1
2017-07-27 04:46:59 +00:00
Yin-Chia Yeh
cb3c3a52ef
Merge "Camera: reset callback after test done" into oc-dr1-dev am: eba1407b55
...
am: 6277952f30 -s ours
Change-Id: I321e1c2b8d79236055a97699408c6fb0dd99be45
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
Change-Id: I7f26656d68a93daadec816d3fe28a000212dd9e4
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 -s ours
Change-Id: Ia0b6863fa82f33d03903f6e17739f8ad339246c5
2017-07-27 01:15:25 +00:00
TreeHugger Robot
aa84f2b44d
Merge "Re-enable fuzzing tests"
2017-07-26 23:44:35 +00:00
Ying Xu
f93c1a9821
Merge "Fix VTS errors of the network scan API" into oc-dr1-dev am: 6bba7c9ca4 am: b7af89f838
...
am: 830d07c72d
Change-Id: I8047eba3d935b7113a1719e39a09c10a140446e4
2017-07-26 22:38:03 +00:00
Zhuoyao Zhang
5fd2780653
Merge "Move android.hardware.tests.msgq@1.0-impl to system.img" into oc-dr1-dev am: 5614b96de5 -s ours am: e37bbc1522 -s ours
...
am: 1776a3f3e0 -s ours
Change-Id: I94be84336ecfdc7d63b67d1e93de937c84e325db
2017-07-26 22:37:46 +00:00
TreeHugger Robot
31cc8b710d
Merge "Camera: add camera owners"
2017-07-26 22:19:51 +00:00
Yin-Chia Yeh
6277952f30
Merge "Camera: reset callback after test done" into oc-dr1-dev
...
am: eba1407b55
Change-Id: I2ab3b17ad9a0b4893a31d5c50f65ccf72d43c315
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
Zhuoyao Zhang
9e943d5e52
Merge "Move all hidl_test dependencies to the system.img" into oc-dr1-dev am: ab23aa7667 -s ours am: ed0ba15028 -s ours
...
am: 928e9927d7 -s ours
Change-Id: Iae6fb746767ccf2efa90bdc4ce5b19cc2adc6086
2017-07-26 21:28:18 +00:00
Zhuoyao Zhang
170a9d5ab9
Merge "resolve merge conflicts of 8d92561 to oc-mr1-dev" into oc-mr1-dev am: 7c6c8f47c8 -s ours
...
am: 2dfa2135e0 -s ours
Change-Id: Ia91687de671803ccf8a5948dbea902a9cac59631
2017-07-26 21:27:52 +00:00
Zhuoyao Zhang
8ca57002bf
resolve merge conflicts of 8d92561 to oc-mr1-dev am: a27606b640 -s ours
...
am: a2559baa62 -s ours
Change-Id: I151e492e0232bccc9be1b3060f01d6805607e2b8
2017-07-26 21:24:04 +00:00
Zhuoyao Zhang
077c44bc07
resolve merge conflicts of 8d92561 to oc-mr1-dev am: 9ff0bb218b -s ours
...
am: fb28df0233 -s ours
Change-Id: Iab98d610b5cd34307e9d29d70a2dea81e62eea78
2017-07-26 21:23:59 +00:00
Ying Xu
278583cd62
Merge "Fix VTS errors of the network scan API" into oc-dr1-dev am: 6bba7c9ca4 am: d9cdb2181d
...
am: 836df4c7c3
Change-Id: I4856d267481da51b656ead29819dec887e129288
2017-07-26 21:23:36 +00:00
Ying Xu
830d07c72d
Merge "Fix VTS errors of the network scan API" into oc-dr1-dev am: 6bba7c9ca4
...
am: b7af89f838
Change-Id: Id401f0154d24764dc1309e0984b1b310d5a05d2d
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 -s ours
Change-Id: Ibdf81abee5fa042085563b53c28f252c4b7bc2c3
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 -s ours
Change-Id: I9456687ee58b66fd06171833be29f9671c3981ee
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 -s ours
Change-Id: I85140aa418bb451fbcbb34e9c78aa8fa9831af23
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
Change-Id: I8a570589c85c8d6b1f327b5df341d31d4aaff5b6
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 -s ours
Change-Id: I96a35e355d85137462f8dbb9d4d7eb25d047efcb
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 -s ours
Change-Id: I21227e9ca0dd9d4a90098e6e5cde49082bab4d4f
2017-07-26 19:56:55 +00:00
Zhuoyao Zhang
a2559baa62
resolve merge conflicts of 8d92561 to oc-mr1-dev
...
am: a27606b640 -s ours
Change-Id: I251bfac3eb2167400e2510679dd4dd22806c282e
2017-07-26 19:49:58 +00:00
Zhuoyao Zhang
fb28df0233
resolve merge conflicts of 8d92561 to oc-mr1-dev
...
am: 9ff0bb218b -s ours
Change-Id: Ied5990b4138f78deab806bdd8c532cbeee5eb58b
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
Change-Id: I8d29e4778235d7bc30a0b2c541007854e64a9214
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
Change-Id: Ida8be5c1e8f34a8fad520964b1a7104f9744efc1
2017-07-26 18:14:56 +00:00
TreeHugger Robot
a99386e0a6
Merge "Camera: reset callback after test done"
2017-07-26 18:02:22 +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
7469ed665d
Merge "Move android.hardware.tests.msgq@1.0-impl to system.img" into oc-dr1-dev am: 5614b96de5 -s ours am: 3db81e41d1 -s ours
...
am: 6bc3eb9ed6 -s ours
Change-Id: If7307b33f8ad5296442eccd2022f5e1c0b8feb88
2017-07-26 03:30:35 +00:00
Zhuoyao Zhang
cd50c0c90c
Move android.hardware.tests.msgq@1.0-impl to system.img am: 2d2b64e241 -s ours am: 304ba05feb -s ours
...
am: 42cc416a95 -s ours
Change-Id: I738f393b66f2ac9e6eb4986bd8b9359e1d5bfa07
2017-07-26 03:29:08 +00:00
Zhuoyao Zhang
cc57ac31a3
Merge "Move all hidl_test dependencies to the system.img" into oc-dr1-dev am: ab23aa7667 -s ours am: f3feaf41a9 -s ours
...
am: 4fe199047e -s ours
Change-Id: I052433e85698a2a593653f80223cdd4bc2661781
2017-07-26 03:29:02 +00: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 -s ours
Change-Id: Id914832bab75b8302f51a9e35d4269d10cbfc093
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 -s ours
Change-Id: I01cae4c02f0dce584db19792f989a0d3fc4d4903
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 -s ours
Change-Id: Idff0ca6b5a9b12252a0a566cc92bb144e4fdd215
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 -s ours
Change-Id: Ia14d4a6e7c93aae761ab79fb0bdb86091b463313
2017-07-26 03:22:04 +00:00
Zhuoyao Zhang
304ba05feb
Move android.hardware.tests.msgq@1.0-impl to system.img
...
am: 2d2b64e241 -s ours
Change-Id: I04b7c8b98251649f7db5f0d3e4044390b3b3b5a3
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 -s ours
Change-Id: I4988d06cb6c53ed1384b2c7bef19afa23adc5dc6
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
3c112a3ea6
Merge "Remove unnecessary whitespace from enum members in OBD2 properties" into oc-mr1-dev am: 87a14154a9
...
am: e371a4c8b0
Change-Id: I771e9ca90e4008ed2b8d6cd39ae434c9f2b9cee9
2017-07-25 21:51:47 +00:00
Enrico Granata
e371a4c8b0
Merge "Remove unnecessary whitespace from enum members in OBD2 properties" into oc-mr1-dev
...
am: 87a14154a9
Change-Id: I1a7e9c0f4865649b127e0388970fe0d19aaef94c
2017-07-25 21:38:36 +00:00
Eino-Ville Talvala
a02abcff75
Merge "Camera: Don't enforce result metadata queue support" into oc-dev am: 1d1b503b77 -s ours am: 6447e22219 -s ours am: 8ee53284fd -s ours
...
am: 84ce3d51d7 -s ours
Change-Id: I5dec490f3ba4ab13623398d617c4b622a4224da9
2017-07-25 21:36:23 +00:00
Eino-Ville Talvala
f8358bbf6b
Merge "Camera: Don't enforce result metadata queue support" into oc-dr1-dev am: 5bc1afb63d -s ours am: 2be29abd56 -s ours
...
am: 08be1457f3 -s ours
Change-Id: Ib54fa3fed107146c1116a1d150cdffe2e5731e5a
2017-07-25 21:36:08 +00:00
Eino-Ville Talvala
afb55043f7
Merge "Camera: Don't enforce result metadata queue support" into oc-dev am: 1d1b503b77 -s ours am: 6447e22219 -s ours am: 9276baafa3 -s ours
...
am: c1c4bf18d1 -s ours
Change-Id: I959f08fd02b5156b385029ec4d7f9c97c1aabb96
2017-07-25 21:35:53 +00:00