Commit graph

20165 commits

Author SHA1 Message Date
Automerger Merge Worker
2e33ecf2b0 [automerger skipped] Merge "Add STORAGE_KEY tag to keymaster 4.1" am: 9498310c3d am: 4ae48e66a6 am: 27ffb58396 -s ours
am skip reason: Change-Id I5f7f83755fcbed96d8f38fa51812aa6d2eb0927b with SHA-1 9bc9059842 is in history

Change-Id: Ia507172b2ed718a76fa8abe01a2c6fbc695949b8
2020-02-12 01:24:24 +00:00
Automerger Merge Worker
01b1a25795 [automerger skipped] Merge "Add support lib wrappers for clients" am: b2f3e87ce3 am: ec48df715a am: 2cde0fe22c -s ours
am skip reason: Change-Id I0157df310f85d83cef07282ea80204c035626518 with SHA-1 3d035b9c0b is in history

Change-Id: I28ff7d1bd42516df5502eba0efbd5e112fcca115
2020-02-12 01:24:05 +00:00
Automerger Merge Worker
3be258f337 [automerger skipped] Merge "Keymaster 4.1 VTS tests" am: 75629017d2 am: 56b8c4ede6 am: 4486795de5 -s ours
am skip reason: Change-Id I488402079ebb3940e021ac1558aeee15c4b133c9 with SHA-1 b26a225b9c is in history

Change-Id: Idd06c9a2d71840344b5fe85375345b3c6f5649cd
2020-02-12 01:23:48 +00:00
Automerger Merge Worker
a9e1281207 [automerger skipped] Merge "Update KM4 VTS tests to allow s/w implementation to pass." am: 1cba34ebd4 am: 097aaee88f am: 8bb8904a44 -s ours
am skip reason: Change-Id Idc5de13c342ef1ac62d3131a1a2185d5e78a0d45 with SHA-1 0a6755018f is in history

Change-Id: Ifd01b1222c48f3440694993b11fce6b7fdbce6fb
2020-02-12 01:23:39 +00:00
Automerger Merge Worker
c1202f97f5 [automerger skipped] Merge "Remove service death test." am: 42542b5715 am: d2ac5c416c am: 9f7c58d0e2 -s ours
am skip reason: Change-Id I8f2b7ab3305833fe8639fdefb9cc263f99684920 with SHA-1 13f4bf8491 is in history

Change-Id: I7ec7dc4757e4c5ea05ecf5ee04ee55bc1f46fdd2
2020-02-12 01:23:28 +00:00
Automerger Merge Worker
af5bcf9601 [automerger skipped] Merge "Change finish input test to avoid large sizes." am: c24d51fa46 am: bf1591fd91 am: 934b414db6 -s ours
am skip reason: Change-Id I2460106cf918e44ea5eeac5c518a89c311756eb3 with SHA-1 c78dc91896 is in history

Change-Id: I8a7fa3da1a943a7d00e9d02ce0baf8e3fec4fd60
2020-02-12 01:23:14 +00:00
Automerger Merge Worker
021c955342 [automerger skipped] Merge changes I487000cc,I9310a851 am: a15f40bd0c am: 63f4ac766b am: 14e55cd2a3 -s ours
am skip reason: Change-Id I487000cc19fe355fdef88f1561a38b2cbfd3c3c3 with SHA-1 5e1347cedf is in history

Change-Id: Id02996f24071e19d5b70b9f461a989484cf62fbf
2020-02-12 01:23:06 +00:00
Automerger Merge Worker
3c467ae1d8 [automerger skipped] Remove dependency on libsoftkeymaster. am: fcc4c5c71b am: 1c550eb78f am: 729ea4591b -s ours
am skip reason: Change-Id I9310a851648c028850f9795d303419c6a7e29a11 with SHA-1 2adf7fb2d5 is in history

Change-Id: Id81888329c026e0ba641f0f5a93b4b1d32ab6371
2020-02-12 01:23:04 +00:00
Automerger Merge Worker
bb12c9d0fb Merge "power: add more modes into into power hal" am: 502d38d9f7 am: abd26b3862 am: f161aa38b9
Change-Id: I3267bbef33e0136b4f965d4de23a9848c7d02ac4
2020-02-12 01:22:43 +00:00
Automerger Merge Worker
27ffb58396 Merge "Add STORAGE_KEY tag to keymaster 4.1" am: 9498310c3d am: 4ae48e66a6
Change-Id: Icf8a51ca3991686185beb83198ac4d8ceed58fa3
2020-02-12 01:11:41 +00:00
Automerger Merge Worker
2cde0fe22c Merge "Add support lib wrappers for clients" am: b2f3e87ce3 am: ec48df715a
Change-Id: I15ffb93172083d2b0607ebf1fa5cbb942ef26c1d
2020-02-12 01:11:28 +00:00
Automerger Merge Worker
4486795de5 Merge "Keymaster 4.1 VTS tests" am: 75629017d2 am: 56b8c4ede6
Change-Id: I7a3197d977e52756e83e6a5f556941d69fed8d7d
2020-02-12 01:10:58 +00:00
Automerger Merge Worker
8bb8904a44 Merge "Update KM4 VTS tests to allow s/w implementation to pass." am: 1cba34ebd4 am: 097aaee88f
Change-Id: Idd2a1a8bccfba6cf3f3d29bc1c1fddf7ad169644
2020-02-12 01:10:48 +00:00
Automerger Merge Worker
9f7c58d0e2 Merge "Remove service death test." am: 42542b5715 am: d2ac5c416c
Change-Id: I6f27990c868703d7c5eded1fecc49c7e60ab375d
2020-02-12 01:10:35 +00:00
Automerger Merge Worker
934b414db6 Merge "Change finish input test to avoid large sizes." am: c24d51fa46 am: bf1591fd91
Change-Id: I54c81144304d5fe8123e1009e5b1acb49909c1d0
2020-02-12 01:10:23 +00:00
Automerger Merge Worker
14e55cd2a3 Merge changes I487000cc,I9310a851 am: a15f40bd0c am: 63f4ac766b
Change-Id: I4b0546eb8e690fd43e010abe6329fdbe39d7e7b8
2020-02-12 01:10:14 +00:00
Automerger Merge Worker
729ea4591b Remove dependency on libsoftkeymaster. am: fcc4c5c71b am: 1c550eb78f
Change-Id: I47d8d65344bca6a8911f87f49279dd4ce8695481
2020-02-12 01:10:12 +00:00
Automerger Merge Worker
f161aa38b9 Merge "power: add more modes into into power hal" am: 502d38d9f7 am: abd26b3862
Change-Id: I52d3916527338ab3a5eef3638bb5d6d9524fd2c1
2020-02-12 01:09:54 +00:00
Automerger Merge Worker
4ae48e66a6 Merge "Add STORAGE_KEY tag to keymaster 4.1" am: 9498310c3d
Change-Id: Ic9b254f0f1b9ccf7253547b92e123e461c4eb465
2020-02-12 01:07:26 +00:00
Automerger Merge Worker
ec48df715a Merge "Add support lib wrappers for clients" am: b2f3e87ce3
Change-Id: If4f081c444e653b02f08c33ebdb2725a4be3a6b7
2020-02-12 01:06:54 +00:00
Automerger Merge Worker
56b8c4ede6 Merge "Keymaster 4.1 VTS tests" am: 75629017d2
Change-Id: I44e678dac52ec15b7c3d1884735582495dfd21ab
2020-02-12 01:05:59 +00:00
Automerger Merge Worker
097aaee88f Merge "Update KM4 VTS tests to allow s/w implementation to pass." am: 1cba34ebd4
Change-Id: I83adafe6eef5abad38647a55f854a7985843ad10
2020-02-12 01:05:45 +00:00
Automerger Merge Worker
d2ac5c416c Merge "Remove service death test." am: 42542b5715
Change-Id: I0369512d0682c44043687ae6ee0db48fd910a5de
2020-02-12 01:05:23 +00:00
Automerger Merge Worker
bf1591fd91 Merge "Change finish input test to avoid large sizes." am: c24d51fa46
Change-Id: Iffab4f642ffe606189b50c8409150def00cd6e58
2020-02-12 01:05:00 +00:00
Automerger Merge Worker
63f4ac766b Merge changes I487000cc,I9310a851 am: a15f40bd0c
Change-Id: Ib890b46db60d9099123f60494fcc8a8f046c9728
2020-02-12 01:03:43 +00:00
Automerger Merge Worker
1c550eb78f Remove dependency on libsoftkeymaster. am: fcc4c5c71b
Change-Id: I80a3f4f8a9b9715e63ad84365cf2793b5aaf1446
2020-02-12 01:03:40 +00:00
Treehugger Robot
9498310c3d Merge "Add STORAGE_KEY tag to keymaster 4.1" 2020-02-12 00:56:27 +00:00
Treehugger Robot
b2f3e87ce3 Merge "Add support lib wrappers for clients" 2020-02-12 00:56:18 +00:00
Treehugger Robot
75629017d2 Merge "Keymaster 4.1 VTS tests" 2020-02-12 00:56:06 +00:00
Treehugger Robot
1cba34ebd4 Merge "Update KM4 VTS tests to allow s/w implementation to pass." 2020-02-12 00:55:56 +00:00
Treehugger Robot
42542b5715 Merge "Remove service death test." 2020-02-12 00:55:47 +00:00
Treehugger Robot
c24d51fa46 Merge "Change finish input test to avoid large sizes." 2020-02-12 00:55:27 +00:00
Treehugger Robot
a15f40bd0c Merge changes I487000cc,I9310a851
* changes:
  Update Keymaster 4.0 VTS to use parameterized tests.
  Remove dependency on libsoftkeymaster.
2020-02-12 00:55:15 +00:00
Automerger Merge Worker
abd26b3862 Merge "power: add more modes into into power hal" am: 502d38d9f7
Change-Id: If1d79bb206c83832ca2913268c7381a407de42db
2020-02-12 00:53:08 +00:00
Wei Wang
502d38d9f7 Merge "power: add more modes into into power hal" 2020-02-12 00:40:57 +00:00
Automerger Merge Worker
fbd357c163 [automerger skipped] Update VTS tests for executeFenced am: aaa3c24f10 am: be35252727 am: 0a5557f078 -s ours
am skip reason: Change-Id If90a0dce8c8907a2f8f806455074fa27e3f397ef with SHA-1 15a25f6ec1 is in history

Change-Id: Ia21bd0853d760a425b7225d764762fb7b5e612b9
2020-02-12 00:38:19 +00:00
Automerger Merge Worker
1668e79b3d [automerger skipped] Add a VTS test to validate NNAPI driver name string. am: cc18d3fede am: eb72581807 am: 30f25018ec -s ours
am skip reason: Change-Id Iead93f0a251fdbbf94df6dfdf27919d3f6fd71a8 with SHA-1 2729d825cb is in history

Change-Id: I8a88954d03744aab891b103ca11af7e18daccccb
2020-02-12 00:38:17 +00:00
Automerger Merge Worker
0a5557f078 Update VTS tests for executeFenced am: aaa3c24f10 am: be35252727
Change-Id: I05e6659ca2d71b52ceaf743f55cff96b7e6ab7c3
2020-02-12 00:17:52 +00:00
Automerger Merge Worker
30f25018ec Add a VTS test to validate NNAPI driver name string. am: cc18d3fede am: eb72581807
Change-Id: Id743da698ba9a384256e1f28b6f9e4b8afdea1f7
2020-02-12 00:17:51 +00:00
Automerger Merge Worker
be35252727 Update VTS tests for executeFenced am: aaa3c24f10
Change-Id: Ieb8f5d319c0d71fd4b33d7a19f289a34e047cba3
2020-02-12 00:02:17 +00:00
Automerger Merge Worker
eb72581807 Add a VTS test to validate NNAPI driver name string. am: cc18d3fede
Change-Id: Idf27e80e73b8e4b98bc3e11c4abed5e19faa8e07
2020-02-12 00:02:14 +00:00
Enrico Granata
bac4ea4037 Merge "Move the virtualized vehicle hal code into the trout tree" 2020-02-11 23:11:33 +00:00
Sarah Chin
fec7c4e0a0 HAL changes for 1.5 setLinkCapacityReportingCriteria
Add to IRadio, IRadioResponse, and VTS

Test: make cf_x86_phone-userdebug && mm
Bug: 149112073
Change-Id: I330d5be6bf531c93439f8f1d55718f71ec46c1c3
2020-02-11 15:10:50 -08:00
Nathan Harold
d460a318a4 Merge "Add a VTS test for BarringInfo" 2020-02-11 23:08:51 +00:00
Shawn Willden
fcc4c5c71b Remove dependency on libsoftkeymaster.
This is part of a refactor to facilitate reuse in Keymaster 4.1 VTS
tests.

Bug: 140193672
Bug: 140192237
Test: VtsHalKeymasterV4_0TargetTest
Change-Id: I9310a851648c028850f9795d303419c6a7e29a11
Merged-In: I9310a851648c028850f9795d303419c6a7e29a11
2020-02-11 15:51:03 -07:00
Barani Muthukumaran
9e8014d1d5 Add STORAGE_KEY tag to keymaster 4.1
These are keymaster keys used specifically for storage
encryption. This provides the ability for keymaster implementations to
securely protect storage encryption keys.

Test: VtsHalKeymasterV4_1TargetTest
Bug: 147733587
Change-Id: I5f7f83755fcbed96d8f38fa51812aa6d2eb0927b
Merged-In: I5f7f83755fcbed96d8f38fa51812aa6d2eb0927b
2020-02-11 15:51:03 -07:00
Shawn Willden
166c5c70c2 Add support lib wrappers for clients
Bug: 140193672
Bug: 140192237
Test: CtsKeystoreTestCases
Change-Id: I0157df310f85d83cef07282ea80204c035626518
Merged-In: I0157df310f85d83cef07282ea80204c035626518
2020-02-11 15:51:03 -07:00
Shawn Willden
3f7c80ac05 Keymaster 4.1 VTS tests
Bug: 140193672
Bug: 140192237
Test:  VtsHalKeymasterV4_1TargetTest
Change-Id: I488402079ebb3940e021ac1558aeee15c4b133c9
Merged-In: I488402079ebb3940e021ac1558aeee15c4b133c9
2020-02-11 15:51:03 -07:00
Shawn Willden
390825b291 Update KM4 VTS tests to allow s/w implementation to pass.
Although no real devices should have a software implementation,
emulator and cloud devices do, and it's useful to be able to use them
as a development platform, which is facilitated by having useful VTS
tests.

This is in preparation for Keymaster 4.1 implementation and VTS work.

Bug: 140193672
Bug: 140192237
Bug: 140824829
Test: VtsHalKeymaster4.0TargetTest
Change-Id: Idc5de13c342ef1ac62d3131a1a2185d5e78a0d45
Merged-In: Idc5de13c342ef1ac62d3131a1a2185d5e78a0d45
2020-02-11 15:51:03 -07:00
Shawn Willden
4c813d3c21 Remove service death test.
Moving to KM4.1 VTS.

Test: VtsHalKeymasterV4_0TargetTest
Change-Id: I8f2b7ab3305833fe8639fdefb9cc263f99684920
Merged-In: I8f2b7ab3305833fe8639fdefb9cc263f99684920
2020-02-11 15:51:03 -07:00