Commit Graph

24830 Commits

Author SHA1 Message Date
Bowgo Tsai
e42109b559 Allowing GSI patch level to be greater than vbmeta SPL am: 2c94e43016
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12501703

Change-Id: Ib1e13162cf67ae22af89270bae2b79c33dd38249
2020-09-03 01:09:38 +00:00
TreeHugger Robot
a515ba23a4 [automerger skipped] Merge "Merge RP1A.200720.011" into stage-aosp-master am: 5b0fb0dc5f -s ours am: 71d651b70e -s ours
am skip reason: Change-Id If6721904a50f164626d30460a2b13c59ffd2814f with SHA-1 f65abbd1c8 is in history

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

Change-Id: Ie8486712789d8d51d1a660e68dd2c1cce4772bc7
2020-09-02 23:36:34 +00:00
TreeHugger Robot
71d651b70e [automerger skipped] Merge "Merge RP1A.200720.011" into stage-aosp-master am: 5b0fb0dc5f -s ours
am skip reason: Change-Id If6721904a50f164626d30460a2b13c59ffd2814f with SHA-1 f65abbd1c8 is in history

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

Change-Id: I905e4741f908818cfb57d0d3e0d7df3b9522bc87
2020-09-02 23:16:44 +00:00
TreeHugger Robot
5b0fb0dc5f Merge "Merge RP1A.200720.011" into stage-aosp-master 2020-09-02 22:29:52 +00:00
Steven Moreland
97c0da9fcd Merge "msgq test service: installable by atest" am: f74120b1fb am: b793e77b3d am: 2bd24fb45f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1313073

Change-Id: I2887c1bda703a83c710cc5ee73a9200e180df1c2
2020-09-02 21:36:26 +00:00
Steven Moreland
2bd24fb45f Merge "msgq test service: installable by atest" am: f74120b1fb am: b793e77b3d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1313073

Change-Id: I0f9f8368e27c151338e5b4008c6069916a2ab087
2020-09-02 20:56:02 +00:00
Steven Moreland
b793e77b3d Merge "msgq test service: installable by atest" am: f74120b1fb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1313073

Change-Id: Ia3f23b103e165c03a9fc97673ac2240796bbdf0d
2020-09-02 20:32:54 +00:00
Steven Moreland
f74120b1fb Merge "msgq test service: installable by atest" 2020-09-02 19:42:58 +00:00
Xin Li
7fcc589efd [automerger skipped] Mark RP1A.200720.001 as merged am: 380a862b2d -s ours am: 7c62601b41 -s ours
am skip reason: Change-Id Ic3b7ee64244f03625af7cd2aea055f31febdb19d with SHA-1 c12559f79e is in history

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

Change-Id: If27e2779acd1b41ff37e19256becd62949ff2cc4
2020-09-02 19:37:31 +00:00
Xin Li
7c62601b41 [automerger skipped] Mark RP1A.200720.001 as merged am: 380a862b2d -s ours
am skip reason: Change-Id Ic3b7ee64244f03625af7cd2aea055f31febdb19d with SHA-1 c12559f79e is in history

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

Change-Id: I723515e98a364b46d2eb508ce58d4cf51ecfc5a3
2020-09-02 19:15:20 +00:00
Xin Li
3211c41054 Merge RP1A.200720.011
Bug: 167588565
Merged-In: If6721904a50f164626d30460a2b13c59ffd2814f
Change-Id: I254b5fef3368a656c3f67cdab85623deb5399c88
2020-09-02 11:55:34 -07:00
Xin Li
380a862b2d Mark RP1A.200720.001 as merged
Bug: 167588565
Merged-In: Ic3b7ee64244f03625af7cd2aea055f31febdb19d
Change-Id: Iabf234ab7f9efb872d572e9a49e386bf5af4df01
2020-09-02 11:44:55 -07:00
Treehugger Robot
b4e54879fb Merge "Allowing GSI patch level to be greater than vbmeta SPL" am: b22330e065 am: c12559f79e am: f65abbd1c8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1256345

Change-Id: I25836ec2b42a7f213792b68a53daa781d939f25d
2020-09-02 03:58:34 +00:00
Treehugger Robot
f65abbd1c8 Merge "Allowing GSI patch level to be greater than vbmeta SPL" am: b22330e065 am: c12559f79e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1256345

Change-Id: If6721904a50f164626d30460a2b13c59ffd2814f
2020-09-02 03:39:52 +00:00
Bowgo Tsai
2c94e43016 Allowing GSI patch level to be greater than vbmeta SPL
The GSI patch level might be greater than the vbmeta SPL, because
GSI system.img might be updated via the DSU flow, where vbmeta.img won't
be updated in this scenario.

  https://developer.android.com/topic/dsu

Allowing GSI patch level to be greater than or equal to the vbmeta SPL,
since Treble allows new system.img works on old vendor images.

Bug: 145377203
Test: atest VtsHalKeymasterV4_0TargetTest
Change-Id: Ib761d80c88695eb2db08b0dc00e30fcdc2788865
Merged-In: Ib761d80c88695eb2db08b0dc00e30fcdc2788865
(cherry picked from commit 63c0129fa6)
2020-09-02 11:00:22 +08:00
Treehugger Robot
c12559f79e Merge "Allowing GSI patch level to be greater than vbmeta SPL" am: b22330e065
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1256345

Change-Id: Ic3b7ee64244f03625af7cd2aea055f31febdb19d
2020-09-02 02:27:02 +00:00
Treehugger Robot
b22330e065 Merge "Allowing GSI patch level to be greater than vbmeta SPL" 2020-09-02 01:57:50 +00:00
Xin Li
362a5f29b4 [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 36dcf1a404 -s ours am: d5794fae26 -s ours
am skip reason: Change-Id I6502829205ede2de914b27e6c2c5c42916af2b39 with SHA-1 b659a47fb2 is in history

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

Change-Id: I1dd6d0966c01c8826e22a2533af078b7c0bde797
2020-09-01 21:46:43 +00:00
Xin Li
d5794fae26 [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 36dcf1a404 -s ours
am skip reason: Change-Id I6502829205ede2de914b27e6c2c5c42916af2b39 with SHA-1 b659a47fb2 is in history

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

Change-Id: I5b2316a2c865d42956300b8d0edaeb888eb89a5d
2020-09-01 20:37:07 +00:00
Steven Moreland
d4ed520c27 msgq test service: installable by atest
Bug: 127714188
Test: atest -v fmq_test
Change-Id: Icf696763cbcdd458d36ee709ee9640999c9034ab
2020-08-31 22:50:46 +00:00
TreeHugger Robot
8b6b8a0e78 Merge "Keymaster: update the verifyAuthorization call time and delta time in VerificationToken VTS" into stage-aosp-rvc-ts-dev am: 9ade092595 am: 872216fd37 am: 484456242d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12430970

Change-Id: I326537255f86370c116ce9c82fda4ce02435435f
2020-08-31 18:50:35 +00:00
TreeHugger Robot
bb8e2cf105 Merge "Keymaster: update the verifyAuthorization call time and delta time in VerificationToken VTS" into stage-aosp-rvc-ts-dev am: 9ade092595 am: 872216fd37 am: b849f2258d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12430970

Change-Id: Idf2d8737b29860fff788581da6d3b567a8f5afd2
2020-08-31 18:49:31 +00:00
TreeHugger Robot
484456242d Merge "Keymaster: update the verifyAuthorization call time and delta time in VerificationToken VTS" into stage-aosp-rvc-ts-dev am: 9ade092595 am: 872216fd37
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12430970

Change-Id: I065b9d6122747a55eb4decf0b32b7ff20756e26c
2020-08-31 18:34:09 +00:00
TreeHugger Robot
b849f2258d Merge "Keymaster: update the verifyAuthorization call time and delta time in VerificationToken VTS" into stage-aosp-rvc-ts-dev am: 9ade092595 am: 872216fd37
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12430970

Change-Id: I0a050120caefe1a28496b1ff443cfd8d47b0dbb3
2020-08-31 18:34:05 +00:00
TreeHugger Robot
872216fd37 Merge "Keymaster: update the verifyAuthorization call time and delta time in VerificationToken VTS" into stage-aosp-rvc-ts-dev am: 9ade092595
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12430970

Change-Id: I5e1d4fd71246ebe7027006eb4f1d8f16a5124868
2020-08-31 18:18:58 +00:00
TreeHugger Robot
9ade092595 Merge "Keymaster: update the verifyAuthorization call time and delta time in VerificationToken VTS" into stage-aosp-rvc-ts-dev 2020-08-31 17:39:21 +00:00
Robert Shih
b65b4f552a Merge "VtsHalDrm: run tests in single shard" into stage-aosp-rvc-ts-dev am: c85c77653c am: 731d2e3bb1 am: f4f299d96a
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12469588

Change-Id: I0a21d80da71d8685ced9c3785d04cda79e20ab08
2020-08-28 20:22:43 +00:00
Robert Shih
f8dd336b51 Merge "VtsHalDrm: run tests in single shard" into stage-aosp-rvc-ts-dev am: c85c77653c am: 731d2e3bb1 am: 05453e2dd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12469588

Change-Id: I6c146b5e73cf7c513580bcbe68079b4847514a04
2020-08-28 20:21:50 +00:00
Xin Li
36dcf1a404 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I6502829205ede2de914b27e6c2c5c42916af2b39
Change-Id: I7cb06511e43bd1fffd5f80a11dbdf5b1314cfe8e
2020-08-28 13:05:04 -07:00
Robert Shih
05453e2dd2 Merge "VtsHalDrm: run tests in single shard" into stage-aosp-rvc-ts-dev am: c85c77653c am: 731d2e3bb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12469588

Change-Id: Ic07565b473717d80a6822076dbcdc0d553ba0c29
2020-08-28 20:03:23 +00:00
Robert Shih
f4f299d96a Merge "VtsHalDrm: run tests in single shard" into stage-aosp-rvc-ts-dev am: c85c77653c am: 731d2e3bb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12469588

Change-Id: I7ec5fa45332acee0a3664ca93ba8fe689439ffdd
2020-08-28 20:03:16 +00:00
Robert Shih
731d2e3bb1 Merge "VtsHalDrm: run tests in single shard" into stage-aosp-rvc-ts-dev am: c85c77653c
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12469588

Change-Id: Iba106b965e5c4614d49c694254ec0b6ed2db07cb
2020-08-28 19:48:05 +00:00
Robert Shih
c85c77653c Merge "VtsHalDrm: run tests in single shard" into stage-aosp-rvc-ts-dev 2020-08-28 19:30:55 +00:00
Yu-Han Yang
c255358f23 Add capability check for satellite blacklist tests am: c40aa186ea am: faec210a8e am: 244b98440f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12463613

Change-Id: I113b6050a8680888dfabf8d928a1221fc6313ef9
2020-08-27 19:10:31 +00:00
Yu-Han Yang
1f60634c3e Add capability check for satellite blacklist tests am: c40aa186ea am: faec210a8e am: 50e94f9525
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12463613

Change-Id: I61c4c8823aa603f38ee0b0bd51c8be9352e0193b
2020-08-27 19:08:57 +00:00
Yu-Han Yang
244b98440f Add capability check for satellite blacklist tests am: c40aa186ea am: faec210a8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12463613

Change-Id: Ic9fbdc97f162e434d164d27c0478da640021419f
2020-08-27 18:58:43 +00:00
Yu-Han Yang
50e94f9525 Add capability check for satellite blacklist tests am: c40aa186ea am: faec210a8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12463613

Change-Id: Ida1726ca76a76368a8b1fbd9f349a56a1fdbc628
2020-08-27 18:58:36 +00:00
Yu-Han Yang
faec210a8e Add capability check for satellite blacklist tests am: c40aa186ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12463613

Change-Id: I29409edce51e57acd7f5013e74b759e8cecb2fac
2020-08-27 18:39:22 +00:00
Robert Shih
f2eaf2c299 VtsHalDrm: run tests in single shard
Currently drm cert provisioning is performed as an indivdual test case.
Other tests (e.g. decrypt tests) have dependency on drm cert
provisioning.

Bug: 165493235
Test: VtsHalDrmV1_0TargetTest
Test: VtsHalDrmV1_1TargetTest
Test: VtsHalDrmV1_2TargetTest
Test: VtsHalDrmV1_3TargetTest
Change-Id: I7aad35747997e6ce5b06919344475e0f2754cd15
2020-08-27 08:58:04 -07:00
Treehugger Robot
e2769b4c4c Merge "Avoid unnecessary access of BoringSSL structs." am: 12d0f6d9a1 am: 18aa69f6b2 am: fdc2a99661
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1412697

Change-Id: I22ea5cb5e6bbf3875c69143822dfebcc3715d0a6
2020-08-26 22:02:23 +00:00
Shuo Qian
df13a17e59 Check emergency dialing result in DSDS or TSTS only if slot is in service or emergency only. am: 721fecbaaf am: 9ab2f003ac am: 97fc7b7db1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1412188

Change-Id: Icab1bc032daf427dfb8ec550b58285daa9f5c57f
2020-08-26 22:02:00 +00:00
Treehugger Robot
fdc2a99661 Merge "Avoid unnecessary access of BoringSSL structs." am: 12d0f6d9a1 am: 18aa69f6b2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1412697

Change-Id: I2c63ce2a06bfd63834cccc9b7bb947f07b59666f
2020-08-26 21:15:21 +00:00
Shuo Qian
97fc7b7db1 Check emergency dialing result in DSDS or TSTS only if slot is in service or emergency only. am: 721fecbaaf am: 9ab2f003ac
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1412188

Change-Id: I852b71606b11aca58f6fff073c4dcc45761d84f7
2020-08-26 21:15:00 +00:00
Treehugger Robot
18aa69f6b2 Merge "Avoid unnecessary access of BoringSSL structs." am: 12d0f6d9a1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1412697

Change-Id: I84154db8f6c9036248cc922b5ea92a724f8f975b
2020-08-26 20:56:07 +00:00
Shuo Qian
9ab2f003ac Check emergency dialing result in DSDS or TSTS only if slot is in service or emergency only. am: 721fecbaaf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1412188

Change-Id: I297d1ec9a9ef3e95d6824a9a03ae1e67c677f905
2020-08-26 20:56:01 +00:00
Treehugger Robot
12d0f6d9a1 Merge "Avoid unnecessary access of BoringSSL structs." 2020-08-26 20:48:04 +00:00
Yu-Han Yang
c40aa186ea Add capability check for satellite blacklist tests
Bug: 166251991
Test: on device
Change-Id: I27e515a5f2a6676a250f361b17b056a73e209ad3
2020-08-26 20:41:51 +00:00
David Benjamin
45ff9aa8ff Avoid unnecessary access of BoringSSL structs.
Checking cert_info->key->algor->algorithm is redundant with the checks
following it. If the public key is an EC key, that was the OID. Remove
the check so this code does not break when BoringSSL makes the X509
structures opaque in the future.

While we're not particularly aiming to make ECDSA_SIG opaque, getters
exist, so go ahead and use them.

Test: mm, treehugger
Change-Id: I1b37fef2290b7697a6e821f20ba702b3da5ef18d
2020-08-26 15:38:47 -04:00
Shuo Qian
721fecbaaf Check emergency dialing result in DSDS or TSTS only if slot is in service or emergency only.
Test: vts
Bug: 156525817
Change-Id: Ic4c735e6d920fc3df28eda7bc3f0b958782bf42d
Merged-In: Ic4c735e6d920fc3df28eda7bc3f0b958782bf42d
(cherry picked from commit 3381ce1f9a2c3ad06b59288e5ba359aa7a89de4e)
2020-08-26 17:00:44 +00:00
lesl
81e3a85011 vts: Fix incorrect instance name in Teardown am: a6cc5825e9 am: 9ce5301add am: 04d7e84c6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12422070

Change-Id: Ia07a1c4345f00d4d2d2fedb5fdd9fb980a23bda0
2020-08-26 15:19:46 +00:00