Commit Graph

24830 Commits

Author SHA1 Message Date
josephjang
4feb8cd284 Keymaster: Fix potential bug in extractUint32()/extractUint64()
In deserializeVerificationToken(), we use extractUint64() to extract
VerificationToken.challenge. A potential bug was found in
extractUint64() that will cause VerificationToken.challenge()
incorrect.

Bug: 160198696
Merged-In: Ie0d2c0127cc34f1bb90455e4f7869e15e5542173
Change-Id: Ie0d2c0127cc34f1bb90455e4f7869e15e5542173
2020-07-06 07:03:27 +00:00
josephjang
c96b1fab12 Keymaster: Fix potential bug in extractUint32()/extractUint64()
In deserializeVerificationToken(), we use extractUint64() to extract
VerificationToken.challenge. A potential bug was found in
extractUint64() that will cause VerificationToken.challenge()
incorrect.

Bug: 160198696
Change-Id: Ie0d2c0127cc34f1bb90455e4f7869e15e5542173
2020-07-06 14:53:55 +08:00
Jooyung Han
d18cba85fe update hidl .bp
HIDL libs are not necessarily part of VNDK now. Because some are
used by VNDK libs, they are still VNDK. But rest are now just
vendor-available.

.hidl_for_test files are also removed because they are used to exclude
test-purpose hidl libs from VNDK libs.

Instead, .hidl_for_system_ext files are added to tests/lazy to
distinguish them from others which are installed /system.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
Change-Id: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
(cherry picked from commit b0907a6bb8)
2020-07-02 12:26:37 +09:00
Treehugger Robot
34ebb6dd42 Merge "Fix GTestResultParser compatibility" am: 44c14f778b am: 6badfaa8b5 am: 8f315a1f27
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1352763

Change-Id: I540b986231c4403f77f631835467d8d54e7c4d58
2020-07-01 17:09:55 +00:00
Treehugger Robot
8f315a1f27 Merge "Fix GTestResultParser compatibility" am: 44c14f778b am: 6badfaa8b5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1352763

Change-Id: I13156db2e3016d816fbd19ac4ec7bbee87c2855f
2020-07-01 16:59:02 +00:00
Treehugger Robot
6badfaa8b5 Merge "Fix GTestResultParser compatibility" am: 44c14f778b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1352763

Change-Id: I73e4a84e4489869ce806228d82dbd0ba3e49d7d3
2020-07-01 16:47:00 +00:00
Treehugger Robot
44c14f778b Merge "Fix GTestResultParser compatibility" 2020-07-01 16:34:51 +00:00
Tomasz Wasilczyk
751855d89b Fix GTestResultParser compatibility
Bug: 158643176
Test: adb shell /data/nativetest64/VtsHalBroadcastradioV2_0TargetTest/VtsHalBroadcastradioV2_0TargetTest
Change-Id: Id0c936da397f7b06b2f274e036dc789cdcd506da
2020-07-01 07:55:37 -07:00
android-build-team Robot
cafcaddc57 Snap for 6643974 from d1c75f1d89 to mainline-release
Change-Id: I37e0fb3ec6d22e3fa19507ed3143bf1bac4f9650
2020-07-01 03:09:44 +00:00
android-build-team Robot
6fcb77f274 Snap for 6643631 from ef7bf24010 to rvc-release
Change-Id: I03d613d159b65d6bf2ebe22c45a43970ec61a550
2020-07-01 01:10:12 +00:00
Jordan Liu
20064121a5 [automerger skipped] Merge "Override gtest timeout and add logging" am: cb844d5695 am: 65eddf19ba -s ours am: 478757a955 -s ours
am skip reason: Change-Id I0825305258bae20ea6e13e9b9a65ce30b7153611 with SHA-1 fffbdfa1eb is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1352902

Change-Id: Iba5202cf18f5b5786e6a620ac6a72de46ba6ba14
2020-06-30 20:18:01 +00:00
Jordan Liu
478757a955 [automerger skipped] Merge "Override gtest timeout and add logging" am: cb844d5695 am: 65eddf19ba -s ours
am skip reason: Change-Id I0825305258bae20ea6e13e9b9a65ce30b7153611 with SHA-1 fffbdfa1eb is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1352902

Change-Id: If29a80fd8a5f4f0cb2ec8b159af995b84f9e2f7d
2020-06-30 20:05:36 +00:00
Jordan Liu
65eddf19ba Merge "Override gtest timeout and add logging" am: cb844d5695
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1352902

Change-Id: I36332a20b0a4e9f6a71a8a640c3d853e6c81cc6e
2020-06-30 19:55:58 +00:00
Jordan Liu
cb844d5695 Merge "Override gtest timeout and add logging" 2020-06-30 19:46:17 +00:00
TreeHugger Robot
a9de33018d Merge "Camera: fix the VTS test timeout to be 30min" into rvc-dev am: ef7bf24010 am: 59a28383f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12036144

Change-Id: If18910d53cea04b43200942e2c562efc7cf01b90
2020-06-30 18:32:47 +00:00
TreeHugger Robot
796dde65c0 Merge "Camera: fix the VTS test timeout to be 30min" into rvc-dev am: ef7bf24010 am: 7b04738823
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12036144

Change-Id: I39f1402887c1009c99a62d8f71d1d187547b4fe8
2020-06-30 18:32:22 +00:00
TreeHugger Robot
d1c75f1d89 Merge "Camera: fix the VTS test timeout to be 30min" into rvc-dev am: ef7bf24010
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12036144

Change-Id: I34243abbf06dd38bd2ab41c24abeb39bbdc983c1
2020-06-30 18:21:05 +00:00
TreeHugger Robot
7b04738823 Merge "Camera: fix the VTS test timeout to be 30min" into rvc-dev am: ef7bf24010
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12036144

Change-Id: I4ebbc6d0f5520c96d2d60966ba674633d10728bc
2020-06-30 18:14:06 +00:00
TreeHugger Robot
59a28383f2 Merge "Camera: fix the VTS test timeout to be 30min" into rvc-dev am: ef7bf24010
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12036144

Change-Id: Iba10324055f76a2f7990194c078fabde735b4544
2020-06-30 18:14:05 +00:00
TreeHugger Robot
ef7bf24010 Merge "Camera: fix the VTS test timeout to be 30min" into rvc-dev 2020-06-30 18:01:02 +00:00
android-build-team Robot
23535e6b39 Snap for 6640159 from d9573c1caa to mainline-release
Change-Id: I080e9d999cfacbf0df050dd7fcb9715654fc010c
2020-06-30 03:09:51 +00:00
TreeHugger Robot
cee9937ee7 Merge "Yet more minor fixes on User HAL:" into rvc-dev am: f04be179a7 am: 6bb7b60138
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12000988

Change-Id: I435579cef189339e362c48837657f1ef2f97352e
2020-06-30 01:29:08 +00:00
TreeHugger Robot
59f16828ee Merge "Yet more minor fixes on User HAL:" into rvc-dev am: f04be179a7 am: 59b6c890c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12000988

Change-Id: Ie8258d12aa91b519fb43ce1c9001b08fbece8aa3
2020-06-30 01:28:39 +00:00
TreeHugger Robot
d9573c1caa Merge "Yet more minor fixes on User HAL:" into rvc-dev am: f04be179a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12000988

Change-Id: I355fc9b819ee0b596e00e60f55e24f0f22d0d883
2020-06-30 01:16:23 +00:00
TreeHugger Robot
6bb7b60138 Merge "Yet more minor fixes on User HAL:" into rvc-dev am: f04be179a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12000988

Change-Id: I9a0c61e8a9a523aa0f9a02e1558d99ae58fc18a5
2020-06-30 01:16:03 +00:00
TreeHugger Robot
59b6c890c2 Merge "Yet more minor fixes on User HAL:" into rvc-dev am: f04be179a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12000988

Change-Id: I4d99cb1d89ca49f493798eede6e0afcaf59360c0
2020-06-30 01:16:00 +00:00
android-build-team Robot
407de7c0b3 Snap for 6639787 from dabaad71f7 to rvc-release
Change-Id: I05e6acdaf3c15fdeb898665df7bbf21feb863de0
2020-06-30 01:09:29 +00:00
TreeHugger Robot
f04be179a7 Merge "Yet more minor fixes on User HAL:" into rvc-dev 2020-06-30 01:09:22 +00:00
Matej Pfajfar
ad7c65a3cd Change 'blacklist' to 'disallow' am: 26f365b810 am: 2d0bac77ab am: 3468366623
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1351587

Change-Id: I94b01b2080395f644d335d4dbb3509306f33b414
2020-06-29 23:19:25 +00:00
Matej Pfajfar
3468366623 Change 'blacklist' to 'disallow' am: 26f365b810 am: 2d0bac77ab
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1351587

Change-Id: I4e7fec2b1823cbb7e974be59804cccc38d13614d
2020-06-29 23:05:00 +00:00
Matej Pfajfar
2d0bac77ab Change 'blacklist' to 'disallow' am: 26f365b810
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1351587

Change-Id: Icc1eff787af7978953bc3fd915395fa94e427f0f
2020-06-29 22:54:24 +00:00
TreeHugger Robot
69c9c7bfc1 Merge "Update VTS tests to use GeranBands P900 and 850 instead" into rvc-dev am: dabaad71f7 am: d44ff18a4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11992670

Change-Id: I3019428a2ea1d4336b2910f4ada7a3b6aa4116cc
2020-06-29 21:29:47 +00:00
TreeHugger Robot
4ad238583d Merge "Update VTS tests to use GeranBands P900 and 850 instead" into rvc-dev am: dabaad71f7 am: 0a0d4f41d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11992670

Change-Id: Ic7e0f1403edf26c739f5d1f36a357b462f9a5e8a
2020-06-29 21:29:19 +00:00
TreeHugger Robot
d44ff18a4d Merge "Update VTS tests to use GeranBands P900 and 850 instead" into rvc-dev am: dabaad71f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11992670

Change-Id: I9e4c1759453e38871435db6fd73be59fe75e36a8
2020-06-29 21:17:26 +00:00
TreeHugger Robot
5f8fa8145c Merge "Update VTS tests to use GeranBands P900 and 850 instead" into rvc-dev am: dabaad71f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11992670

Change-Id: I8e7227e005cca9cf24a040bb73f048b1c2b1df95
2020-06-29 21:17:13 +00:00
TreeHugger Robot
0a0d4f41d2 Merge "Update VTS tests to use GeranBands P900 and 850 instead" into rvc-dev am: dabaad71f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11992670

Change-Id: I4f261d982add60db7febc2dac2c840efec63a1c5
2020-06-29 21:16:56 +00:00
TreeHugger Robot
dabaad71f7 Merge "Update VTS tests to use GeranBands P900 and 850 instead" into rvc-dev 2020-06-29 21:00:53 +00:00
Sarah Chin
5836f407aa Update VTS tests to use GeranBands P900 and 850 instead
Also call stopNetworkScan to prevent DEVICE_IN_USE error

Test: run vts VtsHalRadioV1_4Target, VtsHalRadioV1_5Target
Bug: 159582104
Change-Id: If27cb00fe9eb5cf3ce2e73107ed6463c1ebb7cfd
2020-06-29 11:58:00 -07:00
Jordan Liu
efab6b568f Override gtest timeout and add logging
Note that this just increases the gtest time to match our
highest wait times. Each test still has wait times fitted for the
expected length of that test.

Bug: 159289514
Test: atest VtsHalRadioV1_0TargetTest
Change-Id: I0825305258bae20ea6e13e9b9a65ce30b7153611
Merged-In: I0825305258bae20ea6e13e9b9a65ce30b7153611
2020-06-29 11:43:00 -07:00
Yin-Chia Yeh
f65225671c Camera: fix the VTS test timeout to be 30min
Test: test failure is gone
Bug: 159413657
Change-Id: Id1a350081241910463614960c6fdda3d7e32eddc
2020-06-29 09:45:03 -07:00
Slava Shklyaev
dfe1525859 Clarify NNAPI control flow shape constraints RESTRICT AUTOMERGE
This change also removes some non-NN hashes in current.txt that were
unintentionally introduced in https://r.android.com/1178665.

Bug: 156918813
Bug: 158557728
Test: m
Change-Id: I4c2b83e11b27b791b3aa624be68474011b92a269
Merged-In: I4c2b83e11b27b791b3aa624be68474011b92a269
(cherry picked from commit 709842ab98)
2020-06-29 15:31:22 +01:00
Matej Pfajfar
26f365b810 Change 'blacklist' to 'disallow'
Bug: None
Test: mma
Test: atest
Change-Id: I6d1bc4f1cd95a56287127918f4c8111cafd6e833
Merged-In: I6d1bc4f1cd95a56287127918f4c8111cafd6e833
(cherry picked from commit 1bdd58dcf6)
2020-06-29 13:24:11 +01:00
android-build-team Robot
d9539e3266 Snap for 6634345 from 500aabe2d4 to mainline-release
Change-Id: Ib0584c7ea4272b45a09320bbdf4fa1fc851ac72d
2020-06-27 03:24:42 +00:00
android-build-team Robot
c5704e933a Snap for 6634012 from 00f17b9616 to rvc-release
Change-Id: I135e49130e1bc4a3202a6cc62887b8e90420002f
2020-06-27 01:06:28 +00:00
TreeHugger Robot
419d0c6d9f Merge "Override gtest timeout and add logging" into rvc-dev am: 00f17b9616 am: 5bb161d8be
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12010801

Change-Id: I3f0de7a5d79493ca5361b38b4bafe91b15e9e9c3
2020-06-27 00:13:36 +00:00
TreeHugger Robot
8db8bd8588 Merge "Override gtest timeout and add logging" into rvc-dev am: 00f17b9616 am: 6ea33ae111
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12010801

Change-Id: I296b486961b32f04934bc5d068ab87d98fdefca2
2020-06-27 00:13:20 +00:00
TreeHugger Robot
500aabe2d4 Merge "Override gtest timeout and add logging" into rvc-dev am: 00f17b9616
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12010801

Change-Id: I3e1e34d105079049bd7d3e829b0e5d17c08c14ac
2020-06-27 00:00:21 +00:00
TreeHugger Robot
5bb161d8be Merge "Override gtest timeout and add logging" into rvc-dev am: 00f17b9616
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12010801

Change-Id: I9764f4471f998fab1ae18c5d8ca1724be9672a0c
2020-06-26 23:59:48 +00:00
TreeHugger Robot
6ea33ae111 Merge "Override gtest timeout and add logging" into rvc-dev am: 00f17b9616
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12010801

Change-Id: I4edeba84f2e05043b0474db4e809aa501a60fdc6
2020-06-26 23:59:46 +00:00
TreeHugger Robot
00f17b9616 Merge "Override gtest timeout and add logging" into rvc-dev 2020-06-26 23:52:06 +00:00