Commit graph

5481 commits

Author SHA1 Message Date
Automerger Merge Worker
8a37d55821 [automerger skipped] Added identity credential key to keymaster tag set. am: de4d82fc16 am: 2722b2bd63 -s ours am: d579745ed1 -s ours
am skip reason: Change-Id I5a0336692f894580a46d6e70a5b2e2b6d54508e5 with SHA-1 79a5bd607d is in history

Change-Id: Ib48303cff0171a9c7ea5c15bb6c5d8a330bcf02d
2020-03-09 21:17:13 +00:00
Automerger Merge Worker
fedd138baf [automerger skipped] Added identity credential key to keymaster tag set. am: de4d82fc16 am: 2722b2bd63 am: da530f2e81 am: 942d239dec -s ours
am skip reason: Change-Id I5a0336692f894580a46d6e70a5b2e2b6d54508e5 with SHA-1 79a5bd607d is in history

Change-Id: Ia15030b1254503a139e978366a1fbdd2046a64b7
2020-03-09 21:07:52 +00:00
Automerger Merge Worker
f08562cb5d [automerger skipped] Added identity credential key to keymaster tag set. am: de4d82fc16 -s ours am: c71e502f12 -s ours
am skip reason: Change-Id I5a0336692f894580a46d6e70a5b2e2b6d54508e5 with SHA-1 79a5bd607d is in history

Change-Id: If458a46c87b3d9e588fb92a7820a48ec739ca5bf
2020-03-09 20:58:28 +00:00
Automerger Merge Worker
942d239dec Added identity credential key to keymaster tag set. am: de4d82fc16 am: 2722b2bd63 am: da530f2e81
Change-Id: Idb61e280a9cbb740530ce7ca061079c6da2a1d7f
2020-03-09 20:50:21 +00:00
Automerger Merge Worker
da530f2e81 Added identity credential key to keymaster tag set. am: de4d82fc16 am: 2722b2bd63
Change-Id: Ibb4c3e8054a6dfa372edc07d67e89b8d7b2f365c
2020-03-09 20:37:07 +00:00
Automerger Merge Worker
d579745ed1 [automerger skipped] Added identity credential key to keymaster tag set. am: de4d82fc16 am: 2722b2bd63 -s ours
am skip reason: Change-Id I5a0336692f894580a46d6e70a5b2e2b6d54508e5 with SHA-1 79a5bd607d is in history

Change-Id: Ifd900ed73088e3cadec78f19a968ee8e911097ee
2020-03-09 20:36:45 +00:00
Automerger Merge Worker
c71e502f12 [automerger skipped] Added identity credential key to keymaster tag set. am: de4d82fc16 -s ours
am skip reason: Change-Id I5a0336692f894580a46d6e70a5b2e2b6d54508e5 with SHA-1 79a5bd607d is in history

Change-Id: Ib805862e9855121ae6d1f0ca3f1bc55536cdb442
2020-03-09 20:31:51 +00:00
Automerger Merge Worker
2722b2bd63 Added identity credential key to keymaster tag set. am: de4d82fc16
Change-Id: Idf8633843a82d4c4aae003063a4bd599f1db1602
2020-03-09 20:29:53 +00:00
Selene Huang
de4d82fc16 Added identity credential key to keymaster tag set.
Bug: 149908474

Test: atest android.security.identity.cts.AttestationTest
Test: atest VtsHalIdentityCredentialTarge
Merged-In: I5a0336692f894580a46d6e70a5b2e2b6d54508e5
Change-Id: I4c1cf2cc5112ccae2151958c65025d9e225bdeed
2020-03-09 12:28:05 -04:00
Automerger Merge Worker
225df3799d Add a callback for codec format changed. am: 3b4b33f479 am: bfad736f8e am: e007d2f6cb
Change-Id: I56a141fba129df392f65e59c808dbd9dd952fd50
2020-02-26 19:23:06 +00:00
Automerger Merge Worker
7636581820 Add a callback for codec format changed. am: 3b4b33f479 am: c320973058 am: c302d10c67
Change-Id: I43357f84e82bf5af7deacfd1a3ac22314efb1920
2020-02-26 19:19:20 +00:00
Automerger Merge Worker
779e55f0cc Add a callback for codec format changed. am: 3b4b33f479 am: bfad736f8e am: 76c4cddf79
Change-Id: I4bad76613ab35e86f78d17764ad44a89a8383278
2020-02-26 19:19:06 +00:00
Automerger Merge Worker
e007d2f6cb Add a callback for codec format changed. am: 3b4b33f479 am: bfad736f8e
Change-Id: Ib096caea99f8c4b0f2f7436a5e6886a6bcb9aa9c
2020-02-26 19:06:53 +00:00
Automerger Merge Worker
c302d10c67 Add a callback for codec format changed. am: 3b4b33f479 am: c320973058
Change-Id: I6ebb5e7da55ae6f6fc45911a109dd3a052f724ad
2020-02-26 19:06:50 +00:00
Automerger Merge Worker
76c4cddf79 Add a callback for codec format changed. am: 3b4b33f479 am: bfad736f8e
Change-Id: I4273b16acafdf3b2e421be71f8daf776e123d1db
2020-02-26 19:06:34 +00:00
Automerger Merge Worker
bfad736f8e Add a callback for codec format changed. am: 3b4b33f479
Change-Id: Iac5fce65df8db03b8dd714d72da07295b0e39636
2020-02-26 18:54:19 +00:00
Automerger Merge Worker
c320973058 Add a callback for codec format changed. am: 3b4b33f479
Change-Id: Idb2e22016e4a58cc1315d8f1355830512fb58ffb
2020-02-26 18:54:15 +00:00
Automerger Merge Worker
541b3b3171 Merge "Added identity credential key to keymaster tag set." am: 0f6a221b62 am: 353924555e am: 0f30f984e8 am: 049d475022
Change-Id: I0bdd8f3b5b22116820dc3efaf47c48ba8a755a22
2020-02-25 22:16:55 +00:00
Automerger Merge Worker
049d475022 Merge "Added identity credential key to keymaster tag set." am: 0f6a221b62 am: 353924555e am: 0f30f984e8
Change-Id: I5de8c4ccb342d581a22df3ed73be325d6d27edc9
2020-02-25 21:58:14 +00:00
Automerger Merge Worker
0f30f984e8 Merge "Added identity credential key to keymaster tag set." am: 0f6a221b62 am: 353924555e
Change-Id: I8b9be13d5928f2a9221c08a5801b8a3b4f7f4fe0
2020-02-25 21:41:46 +00:00
Automerger Merge Worker
868e69a2aa Merge "Added identity credential key to keymaster tag set." am: 0f6a221b62 am: 353924555e
Change-Id: I3d3dbcf2efe21edabb63d7e071f54920e993683a
2020-02-25 21:41:33 +00:00
Automerger Merge Worker
353924555e Merge "Added identity credential key to keymaster tag set." am: 0f6a221b62
Change-Id: I1ee8f687385bb2d5026f6bee351008ee8704ae82
2020-02-25 21:26:10 +00:00
Selene Huang
0f6a221b62 Merge "Added identity credential key to keymaster tag set." 2020-02-25 21:21:03 +00:00
jiabin
3b4b33f479 Add a callback for codec format changed.
Bug: 133526565
Test: Manually
Change-Id: Ie7d17c7d9b49394601b4788aa44a8407ebb6f72e
2020-02-24 20:49:23 +00:00
Selene Huang
79a5bd607d Added identity credential key to keymaster tag set.
Bug: 149908474

Test: atest android.security.identity.cts.AttestationTest
Test: atest VtsHalIdentityCredentialTarge
Change-Id: I5a0336692f894580a46d6e70a5b2e2b6d54508e5
2020-02-21 15:58:10 -08:00
Automerger Merge Worker
220ed7063e Merge "Add Keymaster4.1 definitions." am: 09b2f93ab9 am: bf3974f323 am: 7dcc835097
Change-Id: I99eded133e22ce7235d85a8ccb24c903b29c9c3e
2020-02-12 01:24:06 +00:00
Automerger Merge Worker
7dcc835097 Merge "Add Keymaster4.1 definitions." am: 09b2f93ab9 am: bf3974f323
Change-Id: I6d588f874ea66cdfa372292aee1ee7d0809a1a3f
2020-02-12 01:11:28 +00:00
Automerger Merge Worker
bf3974f323 Merge "Add Keymaster4.1 definitions." am: 09b2f93ab9
Change-Id: I13dc50025f85e97a5dedb904d09ffb49929f599b
2020-02-12 01:06:54 +00:00
Treehugger Robot
09b2f93ab9 Merge "Add Keymaster4.1 definitions." 2020-02-12 00:56:18 +00:00
Shawn Willden
e59d5b1e2e Add Keymaster4.1 definitions.
Test: VtsHalKeymasterV4_1TargetTest
Change-Id: I501e63a577368d78c609f868e452603b4110a970
2020-02-11 15:51:03 -07:00
Automerger Merge Worker
a7aa2cdbc8 Add ROLLBACK_RESISTANCE definition to for KM4 am: ae001b8b33 am: cac65a5f1f
Change-Id: Ia0e40ab11d00d25f3b741f5c2f868c57d9ff510a
2020-02-11 00:17:09 +00:00
Automerger Merge Worker
cac65a5f1f Add ROLLBACK_RESISTANCE definition to for KM4 am: ae001b8b33
Change-Id: Id3bad86815fc5470d1891d8cc8dc5274cadf0ff9
2020-02-11 00:02:36 +00:00
Matthew Maurer
ae001b8b33 Add ROLLBACK_RESISTANCE definition to for KM4
* Add ROLLBACK_RESISTANCE tag
* Add ROLLBACK_RESISTANCE_UNAVAILABLE error code

Test: m libkeymaster_messages
Change-Id: Ib69a0c0f179f894b488da8608e6005e68450453a
(cherry picked from commit df2f2301a3)
(cherry picked from commit 6f48a11a79)
2020-02-10 22:14:06 +00:00
Automerger Merge Worker
9dfee6c767 [automerger skipped] Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: a8c23bc91e am: a2e1109653 am: cb4adc54e3 -s ours
am skip reason: subject contains skip directive

Change-Id: I5c09110520d7acdd672daf115927f508b43515dc
2020-02-08 02:24:41 +00:00
Automerger Merge Worker
f77f808f5b [automerger skipped] DO NOT MERGE - Merge QQ1A.200205.002 into master am: ea78baf341 am: 594d100464 am: f2bdf90368 -s ours
am skip reason: subject contains skip directive

Change-Id: I1710be98e1e7aacf753bf9ce1a0c4a7891e32ce6
2020-02-08 02:22:10 +00:00
Automerger Merge Worker
cb4adc54e3 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: a8c23bc91e am: a2e1109653
Change-Id: Ief2e8fd835612e700ddcc34a20069f52f4a788ab
2020-02-08 01:56:59 +00:00
Automerger Merge Worker
f2bdf90368 DO NOT MERGE - Merge QQ1A.200205.002 into master am: ea78baf341 am: 594d100464
Change-Id: I889ba9d170bd49daac8e018eeeb64c55eaff6b34
2020-02-08 01:55:27 +00:00
Automerger Merge Worker
a2e1109653 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: a8c23bc91e
Change-Id: I09a06d569ae7983a92fdeae12dd784d1f399dd60
2020-02-08 01:50:13 +00:00
Automerger Merge Worker
594d100464 DO NOT MERGE - Merge QQ1A.200205.002 into master am: ea78baf341
Change-Id: I9349e2af0fd243a97e4b3683706870f018cf693e
2020-02-08 01:38:43 +00:00
Treehugger Robot
a8c23bc91e Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" 2020-02-08 01:29:23 +00:00
Automerger Merge Worker
c2db733781 Add ROLLBACK_RESISTANCE definition to for KM4 am: 6f48a11a79
Change-Id: I87d256349f8b1b02dae4594bdfaf2d04c876bf52
2020-02-07 21:30:55 +00:00
Matthew Maurer
6f48a11a79 Add ROLLBACK_RESISTANCE definition to for KM4
* Add ROLLBACK_RESISTANCE tag
* Add ROLLBACK_RESISTANCE_UNAVAILABLE error code

Test: m libkeymaster_messages
Change-Id: Ib69a0c0f179f894b488da8608e6005e68450453a
(cherry picked from commit df2f2301a3)
2020-02-07 16:01:55 +00:00
Xin Li
ea78baf341 DO NOT MERGE - Merge QQ1A.200205.002 into master
Bug: 147428392
Change-Id: I92ed91736a7fdb8f03a720d945f859cc49b430ac
2020-02-05 10:45:12 -08:00
TreeHugger Robot
fadd886ad2 Merge "Update new values for latest sensor HAL changes" 2020-01-24 18:45:02 +00:00
Dan Stoza
d5f2f67cd2 [hwc2] Add generic layer metadata (Composer 2.4)
Bug: 139747351
Test: VtsHalGraphicsComposerV2_4TargetTest
Test: Manual verification with a modified Composer implementation
Change-Id: Id3ac89612f41ef1d4d03552cc7b0851f6aba1f77
2020-01-22 15:18:30 -08:00
Matthew Maurer
df2f2301a3 Add ROLLBACK_RESISTANCE definition to for KM4
* Add ROLLBACK_RESISTANCE tag
* Add ROLLBACK_RESISTANCE_UNAVAILABLE error code

Test: m libkeymaster_messages
Change-Id: Ib69a0c0f179f894b488da8608e6005e68450453a
2020-01-20 21:11:01 -07:00
Peiyong Lin
7190983117 Merge "Add getClientTargetProperty API entry." 2020-01-18 01:08:19 +00:00
Anthony Stange
e2a118aafb Update new values for latest sensor HAL changes
A hinge angle sensor type has been added to the sensor HAL which
requires updating sensor.h and sensor-base.h.

Bug: 144139857
Test: N/A
Change-Id: I0d8e7d028cc1b2e05a8ec74b7ab3da9ffff5dbde
2020-01-16 19:39:06 -05:00
Automerger Merge Worker
186f4476e1 [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: ead3ab68fe am: 5687a73d9c -s ours
am skip reason: subject contains skip directive

Change-Id: I00a0b32284a9f2e44f83c8974605fc5b4231611c
2020-01-16 19:01:02 +00:00
Automerger Merge Worker
5687a73d9c DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: ead3ab68fe
Change-Id: I104d6135b62c9367a6156f657370ad307fcdc92c
2020-01-16 18:34:43 +00:00