Commit graph

5419 commits

Author SHA1 Message Date
Xin Li
6e1b4e18f2 Mark ab/6881855 as merged
Bug: 172690556
Change-Id: I4fa0e8f07fc295560736c763647ac18d4d7f96a0
2020-11-23 11:31:19 -08:00
Treehugger Robot
210e6bb504 Merge "Add new certificate tags defination for KeyMint V1." am: 78b8a3ffed
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1412868

Change-Id: Ie2376377dd012f13db47ac44d6a6a69b027a2550
2020-11-19 13:56:05 +00:00
Treehugger Robot
78b8a3ffed Merge "Add new certificate tags defination for KeyMint V1." 2020-11-19 13:43:50 +00:00
Selene Huang
d7dcd78f01 Add new certificate tags defination for KeyMint V1.
Test: n/a
Change-Id: I05f629feec5cd2bd01f03b88cd5d830bb1f22623
2020-11-18 18:14:50 -08:00
Treehugger Robot
11e5a32f9f Merge "keymaster_defs: Add missing tags added in KM 4.1 and earlier." am: b1b3cd4669
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1480396

Change-Id: I107d380ed11bd50a04cc75e799fd2b45e589aadd
2020-11-03 16:11:27 +00:00
Treehugger Robot
b1b3cd4669 Merge "keymaster_defs: Add missing tags added in KM 4.1 and earlier." 2020-11-03 15:35:09 +00:00
Selene Huang
5d3c1ec971 keymaster_defs: Add missing tags added in KM 4.1 and earlier.
Test: N/A
Change-Id: Ie01cbc50d9bc77150adc46962d06cda2a7c1544a
Merged-In: Ie01cbc50d9bc77150adc46962d06cda2a7c1544a
2020-11-03 03:23:13 +00:00
Treehugger Robot
11e52152dd [automerger skipped] Merge "Merge redfin/bramble support." am: 52e9473f1e -s ours
am skip reason: Change-Id Icce4e4f44a811726f76a8602a44e9060cc1dbaa1 with SHA-1 3109cbe663 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1465935

Change-Id: I8277f169a1a084b98aee309daec057b2b5862484
2020-10-20 19:03:49 +00:00
Treehugger Robot
52e9473f1e Merge "Merge redfin/bramble support." 2020-10-19 23:20:09 +00:00
Xin Li
2c9a8c3b66 Merge redfin/bramble support.
Bug: 171218636
Merged-In: Icce4e4f44a811726f76a8602a44e9060cc1dbaa1
Change-Id: I0a1a06f871172953b18c2fcdd6aedf19ed7b1460
2020-10-19 10:08:21 -07:00
Xin Li
3109cbe663 Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: I047a6d3c09be4f762a745319e2f37d5551abf9f1
Change-Id: Icce4e4f44a811726f76a8602a44e9060cc1dbaa1
2020-10-08 22:58:30 -07:00
Xin Li
4702bf0671 [automerger skipped] Merge "Merge Android R" am: 02dfcc7c15 -s ours am: 5f3a19f76a -s ours am: 51eba9d0f1 -s ours am: c1e843d407 -s ours
am skip reason: Change-Id Ib50a9978c77eda7e20e27f2d63615599f0517b6d with SHA-1 fae361f24e is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1422436

Change-Id: Ib97618f24a680ee8927935929bf5fea4904e1c95
2020-09-11 03:58:41 +00:00
Xin Li
c1e843d407 [automerger skipped] Merge "Merge Android R" am: 02dfcc7c15 -s ours am: 5f3a19f76a -s ours am: 51eba9d0f1 -s ours
am skip reason: Change-Id Ib50a9978c77eda7e20e27f2d63615599f0517b6d with SHA-1 fae361f24e is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1422436

Change-Id: I06fc514a2fe82c1826fefaab9b80ddf718339690
2020-09-11 03:33:10 +00:00
Xin Li
51eba9d0f1 [automerger skipped] Merge "Merge Android R" am: 02dfcc7c15 -s ours am: 5f3a19f76a -s ours
am skip reason: Change-Id Ib50a9978c77eda7e20e27f2d63615599f0517b6d with SHA-1 fae361f24e is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1422436

Change-Id: Ie11c65689005146632761708cfa20033aaa32b20
2020-09-11 02:02:20 +00:00
Xin Li
5f3a19f76a [automerger skipped] Merge "Merge Android R" am: 02dfcc7c15 -s ours
am skip reason: Change-Id Ib50a9978c77eda7e20e27f2d63615599f0517b6d with SHA-1 fae361f24e is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1422436

Change-Id: I1dfdc73c439333e21b5a057c255f40f58361c6ef
2020-09-11 00:39:36 +00:00
Xin Li
02dfcc7c15 Merge "Merge Android R" 2020-09-10 17:22:03 +00:00
Xin Li
1d4cade478 Merge Android R
Bug: 168057903
Merged-In: Ib50a9978c77eda7e20e27f2d63615599f0517b6d
Change-Id: I7cefed0e9b2048b48227da4a2043658ef231a56e
2020-09-08 16:55:29 -07:00
Xin Li
77d46c26dd [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: fae361f24e -s ours am: bebd516578 -s ours am: dd4825f900 -s ours
am skip reason: Change-Id I500b53e89f132b3925e6a1912c75b7834ea47ff4 with SHA-1 0d57727f5a is in history

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

Change-Id: I7e196cf74e2566fb120d7fe949de512db583feb2
2020-09-01 22:09:39 +00:00
Xin Li
dd4825f900 [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: fae361f24e -s ours am: bebd516578 -s ours
am skip reason: Change-Id I500b53e89f132b3925e6a1912c75b7834ea47ff4 with SHA-1 0d57727f5a is in history

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

Change-Id: I57fc999bbd30f806d73339da274f73dac471cd85
2020-09-01 21:46:23 +00:00
Xin Li
bebd516578 [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: fae361f24e -s ours
am skip reason: Change-Id I500b53e89f132b3925e6a1912c75b7834ea47ff4 with SHA-1 0d57727f5a is in history

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

Change-Id: Ie456f76702a06d46e628202a79b4c70dc19c75ae
2020-09-01 20:36:48 +00:00
Xin Li
fae361f24e Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I500b53e89f132b3925e6a1912c75b7834ea47ff4
Change-Id: Ib50a9978c77eda7e20e27f2d63615599f0517b6d
2020-08-27 10:16:42 -07:00
Christopher Ferris
d2a4d93d26 Merge "Update codeMap for v5.8 kernel update." am: a1a6f9e819 am: 36bca0314d am: e7438cd2e8 am: c59eaa7b18
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1388971

Change-Id: I3df9d42508194850bee89054672a9a8114cc7f50
2020-08-06 17:39:43 +00:00
Christopher Ferris
c59eaa7b18 Merge "Update codeMap for v5.8 kernel update." am: a1a6f9e819 am: 36bca0314d am: e7438cd2e8
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1388971

Change-Id: I047a6d3c09be4f762a745319e2f37d5551abf9f1
2020-08-06 17:24:12 +00:00
Christopher Ferris
e7438cd2e8 Merge "Update codeMap for v5.8 kernel update." am: a1a6f9e819 am: 36bca0314d
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1388971

Change-Id: Idcd89f3476767814cf615190cc6d1ece461081e2
2020-08-06 17:05:42 +00:00
Christopher Ferris
36bca0314d Merge "Update codeMap for v5.8 kernel update." am: a1a6f9e819
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1388971

Change-Id: I8223f390579ecaae7fd39e416f728b71b62ccfdd
2020-08-06 16:49:00 +00:00
Christopher Ferris
a1a6f9e819 Merge "Update codeMap for v5.8 kernel update." 2020-08-06 16:31:03 +00:00
Rahul Sabnis
bc0b7ff24e Update the signature of init function to include whether the device is am: 3e7b35ee18 am: 43e0dd5936 am: 234cb4857b am: 1d90247bb1 am: e5ef2a3f04 am: 984f2f2d43 am: 34b5501c04 am: 81c9bbc7c3 am: 34bcef0e6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308134

Change-Id: I4172e0dd6dbad94693e73e6d6b285bebf768b4fd
2020-08-05 23:49:18 +00:00
Rahul Sabnis
53885c02f3 Update the signature of init function to include whether the device is am: 3e7b35ee18 am: 43e0dd5936 am: 234cb4857b am: 1d90247bb1 am: e5ef2a3f04 am: 984f2f2d43 am: 34b5501c04 am: 10851b8aa1 am: 383735dae1
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308134

Change-Id: I6268d2c866aa29d7c7429b30ed3d03417fbec923
2020-08-05 23:48:38 +00:00
Rahul Sabnis
557ec98f22 Update the signature of init function to include whether the device is am: 3e7b35ee18 am: 43e0dd5936 am: 234cb4857b am: 1d90247bb1 am: e5ef2a3f04 am: 984f2f2d43 am: 34b5501c04 am: 81c9bbc7c3 am: a04c971bc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308134

Change-Id: Ibcd7617a909b27d0c20e54117aa44f813d64fc3e
2020-08-05 23:48:13 +00:00
Rahul Sabnis
34bcef0e6c Update the signature of init function to include whether the device is am: 3e7b35ee18 am: 43e0dd5936 am: 234cb4857b am: 1d90247bb1 am: e5ef2a3f04 am: 984f2f2d43 am: 34b5501c04 am: 81c9bbc7c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308134

Change-Id: I1a038ca914191305d8ecd9fd02030e4426ec12ca
2020-08-05 23:32:53 +00:00
Rahul Sabnis
383735dae1 Update the signature of init function to include whether the device is am: 3e7b35ee18 am: 43e0dd5936 am: 234cb4857b am: 1d90247bb1 am: e5ef2a3f04 am: 984f2f2d43 am: 34b5501c04 am: 10851b8aa1
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308134

Change-Id: I6e07ba92c64312d186599612ee71db5458048409
2020-08-05 23:32:51 +00:00
Rahul Sabnis
a04c971bc8 Update the signature of init function to include whether the device is am: 3e7b35ee18 am: 43e0dd5936 am: 234cb4857b am: 1d90247bb1 am: e5ef2a3f04 am: 984f2f2d43 am: 34b5501c04 am: 81c9bbc7c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308134

Change-Id: Iddc22e92298742abd95811ade6332ff501cefdd1
2020-08-05 23:31:30 +00:00
Automerger Merge Worker
8c3b3eae1e Merge "Update the signature of init function to include whether the device is am: 247c646824 am: 14511f6722 am: 99d5aba8ec am: 28ce79352a am: 1751a06b9f am: db07ea5953 am: 8aea9c4f52" into rvc-qpr-dev-plus-aosp 2020-08-05 23:22:06 +00:00
Rahul Sabnis
2ca9e17e61 Update the signature of init function to include whether the device is am: 247c646824 am: 14511f6722 am: 99d5aba8ec am: 28ce79352a am: 1751a06b9f am: db07ea5953 am: 8aea9c4f52
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308133

Change-Id: Ie7f4e597985654e7849ac2efa27dcff7b866acb3
2020-08-05 23:22:00 +00:00
Rahul Sabnis
e8ad567c0e Update the signature of init function to include whether the device is am: 247c646824 am: 14511f6722 am: 99d5aba8ec am: 28ce79352a am: 1751a06b9f am: 0be32e9f2f am: 0917c68fae
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308133

Change-Id: Ia2728e1746dd7afc7f1598f131ed674e169b9bc7
2020-08-05 23:21:53 +00:00
Rahul Sabnis
10e168c2fa Update the signature of init function to include whether the device is am: 247c646824 am: 14511f6722 am: 99d5aba8ec am: 28ce79352a am: 1751a06b9f am: db07ea5953 am: 4be5facf6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308133

Change-Id: Ia61eda1026ba84a3265f3486d2a020de2d95da22
2020-08-05 23:20:43 +00:00
Rahul Sabnis
10851b8aa1 Update the signature of init function to include whether the device is am: 3e7b35ee18 am: 43e0dd5936 am: 234cb4857b am: 1d90247bb1 am: e5ef2a3f04 am: 984f2f2d43 am: 34b5501c04
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308134

Change-Id: I8a02bfc690c9a631b579a835e9e2f87623559bbe
2020-08-05 23:01:54 +00:00
Rahul Sabnis
81c9bbc7c3 Update the signature of init function to include whether the device is am: 3e7b35ee18 am: 43e0dd5936 am: 234cb4857b am: 1d90247bb1 am: e5ef2a3f04 am: 984f2f2d43 am: 34b5501c04
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308134

Change-Id: Ibdd38a7ea19c183ac7d34c55de9d62879ebf4626
2020-08-05 23:01:50 +00:00
Rahul Sabnis
0917c68fae Update the signature of init function to include whether the device is am: 247c646824 am: 14511f6722 am: 99d5aba8ec am: 28ce79352a am: 1751a06b9f am: 0be32e9f2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308133

Change-Id: I2d44ccbca4d272ba0809da1351d3c34a5ab1a386
2020-08-05 22:53:47 +00:00
Rahul Sabnis
8aea9c4f52 Update the signature of init function to include whether the device is am: 247c646824 am: 14511f6722 am: 99d5aba8ec am: 28ce79352a am: 1751a06b9f am: db07ea5953
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308133

Change-Id: I9b08c38fb053eadf9867b4310bd0a59746d16ea1
2020-08-05 22:53:22 +00:00
Rahul Sabnis
4be5facf6d Update the signature of init function to include whether the device is am: 247c646824 am: 14511f6722 am: 99d5aba8ec am: 28ce79352a am: 1751a06b9f am: db07ea5953
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308133

Change-Id: I61f2c9dc76f20b44c3efe84ddc00a8184a099da5
2020-08-05 22:51:57 +00:00
Rahul Sabnis
34b5501c04 Update the signature of init function to include whether the device is am: 3e7b35ee18 am: 43e0dd5936 am: 234cb4857b am: 1d90247bb1 am: e5ef2a3f04 am: 984f2f2d43
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308134

Change-Id: Ie03df2d91b3d7a1c9028f72bed36d92762f123f2
2020-08-05 22:45:34 +00:00
Rahul Sabnis
0be32e9f2f Update the signature of init function to include whether the device is am: 247c646824 am: 14511f6722 am: 99d5aba8ec am: 28ce79352a am: 1751a06b9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308133

Change-Id: I94cdd0813c12bf38918f75bcf0ce5809b2fc5e06
2020-08-05 22:38:40 +00:00
Rahul Sabnis
db07ea5953 Update the signature of init function to include whether the device is am: 247c646824 am: 14511f6722 am: 99d5aba8ec am: 28ce79352a am: 1751a06b9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308133

Change-Id: I841882d2cbbc6ec8f6a1d2b24f9c6d7cd44090ec
2020-08-05 22:38:24 +00:00
Rahul Sabnis
984f2f2d43 Update the signature of init function to include whether the device is am: 3e7b35ee18 am: 43e0dd5936 am: 234cb4857b am: 1d90247bb1 am: e5ef2a3f04
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308134

Change-Id: I644cf88bd8544d59b027019714d337e902697fac
2020-08-05 22:28:57 +00:00
Rahul Sabnis
1751a06b9f Update the signature of init function to include whether the device is am: 247c646824 am: 14511f6722 am: 99d5aba8ec am: 28ce79352a
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308133

Change-Id: I443edd62865ca64aaeeee749818430cd41cf160c
2020-08-05 22:20:56 +00:00
Rahul Sabnis
e5ef2a3f04 Update the signature of init function to include whether the device is am: 3e7b35ee18 am: 43e0dd5936 am: 234cb4857b am: 1d90247bb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308134

Change-Id: I5fa26d51e29dc79cb08209b5ccea9de73d5f465a
2020-08-05 22:14:51 +00:00
Rahul Sabnis
28ce79352a Update the signature of init function to include whether the device is am: 247c646824 am: 14511f6722 am: 99d5aba8ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308133

Change-Id: I6cbcc4aa0fc97bc1fa7cac8aa5ad67c773c0ca64
2020-08-05 22:04:08 +00:00
Rahul Sabnis
1d90247bb1 Update the signature of init function to include whether the device is am: 3e7b35ee18 am: 43e0dd5936 am: 234cb4857b
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308134

Change-Id: Idcf710c40f30caa170e795ab239837256fcc1f61
2020-08-05 21:53:28 +00:00
Rahul Sabnis
99d5aba8ec Update the signature of init function to include whether the device is am: 247c646824 am: 14511f6722
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308133

Change-Id: I9962c4c765f16fdffaac17f24ca62fac6eb0bf31
2020-08-05 21:37:24 +00:00