Commit graph

5369 commits

Author SHA1 Message Date
Shawn Willden
937d61c8c4 Delete keymaster0
Test: Build
Change-Id: I55f713587ccd91a9ec76cc10f84ecb0109aad7ac
2020-12-04 11:52:34 -07:00
Treehugger Robot
30a37a7a4b Merge "Convert mask types from uint32_t to enum type" 2020-12-01 17:06:51 +00:00
Mikhail Naganov
e72761731d Convert mask types from uint32_t to enum type
This applies to the following types:

- audio_gain_mode_t;
- audio_flags_mask_t;
- audio_channel_representation_t;
- audio_channel_mask_t;
- audio_devices_t.

Enum types are distinct thus proper overloading on the type
is possible in C++. Also, assignments to enum types are
less prone to errors.

Bug: 169889714
Test: basic audio functionality
Change-Id: I8f1e6fa2bbad8900fdae66f01ac70c75953fd62c
Merged-In: I8f1e6fa2bbad8900fdae66f01ac70c75953fd62c
2020-11-24 03:43:26 +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
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
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
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
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
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
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
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
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
Rahul Sabnis
234cb4857b Update the signature of init function to include whether the device is am: 3e7b35ee18 am: 43e0dd5936
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308134

Change-Id: I4523232636dfbc6e7718af583bcf06c68c64f976
2020-08-05 21:35:44 +00:00
Rahul Sabnis
43e0dd5936 Update the signature of init function to include whether the device is am: 3e7b35ee18
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12308134

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

Change-Id: I787e5077a29653ecb551f4176fcfa0b2a054f7a5
2020-08-05 21:17:00 +00:00
Christopher Ferris
82dca31ec3 Update codeMap for v5.8 kernel update.
This also allows the previous kernels to still use the previous values.

Test: Builds and boots.
Change-Id: I12b5a5f15d198de642e8582bc2320fe6b1409bcf
2020-08-05 13:27:47 -07:00
Rahul Sabnis
3e7b35ee18 Update the signature of init function to include whether the device is
an ATV

Bug: 157038281
Test: Manual
Change-Id: I1685c4318c27e8dcca5f7a696fe9e1f8bf594b9d
2020-08-04 21:23:34 +00:00
Rahul Sabnis
247c646824 Update the signature of init function to include whether the device is
an ATV

Bug: 157038281
Test: Manual
Change-Id: I1685c4318c27e8dcca5f7a696fe9e1f8bf594b9d
2020-08-04 14:17:15 -07:00
Victor Khimenko
4971ee2522 Make libhardware_headers available for native_bridge am: 8abec648ca am: 32813ef904
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12128050

Change-Id: I6dfe3eb3c85f4ee4bc40d950ba5c92aeb133c790
2020-07-14 17:52:07 +00:00
Victor Khimenko
32813ef904 Make libhardware_headers available for native_bridge am: 8abec648ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12128050

Change-Id: I983ff3e71828596ac9a68870350be6bbf60acd6b
2020-07-14 17:29:52 +00:00
Victor Khimenko
7f187778b7 Make libhardware_headers available for native_bridge am: 8abec648ca am: 0d57727f5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12128050

Change-Id: Iddefda8d833b982c636478e8dfd84be5859b0fc6
2020-07-14 17:29:38 +00:00
Victor Khimenko
0d57727f5a Make libhardware_headers available for native_bridge am: 8abec648ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12128050

Change-Id: I500b53e89f132b3925e6a1912c75b7834ea47ff4
2020-07-14 17:25:43 +00:00
Victor Khimenko
8abec648ca Make libhardware_headers available for native_bridge
Bug: http://b/153609531

Test: m libRSDriver.native_bridge

Change-Id: I05220635027635ff12a7d5201b5c716ca4fda5ea
2020-07-10 20:18:51 +02:00
Victor Khimenko
8fd10da361 Merge "Make libhardware_headers available for native_bridge" am: bbdbd7856a am: de182688ba am: ccfd96793c
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1353604

Change-Id: Ic376ca57a7d2f92f2134867ca3779dffea785d21
2020-07-01 00:53:24 +00:00
Victor Khimenko
ccfd96793c Merge "Make libhardware_headers available for native_bridge" am: bbdbd7856a am: de182688ba
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1353604

Change-Id: I74bda8a955242d75ac2b1ebf73e5e702a5ade38a
2020-07-01 00:43:17 +00:00
Victor Khimenko
de182688ba Merge "Make libhardware_headers available for native_bridge" am: bbdbd7856a
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1353604

Change-Id: I5f2371321e7695bf8384e13a54ba59db3aa505df
2020-07-01 00:30:25 +00:00
Victor Khimenko
bbdbd7856a Merge "Make libhardware_headers available for native_bridge" 2020-07-01 00:16:16 +00:00
Victor Khimenko
e22d90cc0a Make libhardware_headers available for native_bridge
Bug: http://b/153609531

Test: m libRSDriver.native_bridge

Change-Id: I05220635027635ff12a7d5201b5c716ca4fda5ea
2020-06-30 22:56:22 +02:00
Andy Hung
e1dd373993 Merge "audio_alsaops: fix format conversion error handling bug" am: 9a2cf9a818 am: 53ead60966 am: bb2bf2d62d
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1323975

Change-Id: Iaee222d7f0f794e5b312d7c5fc0511db84efa6f7
2020-06-08 17:34:05 +00:00