commit becbfca6319956f7c4818f8ef94f63fe2d261ccd
author Zhaoming Yin <zhaomingyin@google.com> Fri Jan 21 06:54:26 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 21 06:54:26 2022 +0000
tree 56bff37e9769403a418eb846d94086abda2814c2
parent 140613a961b494d4c08103cde66cf73fda837d60
parent 78e7f9c0f161e0bfbeabd51dca0ac0d2796fb665

Fix opendir NULL dirp return issue am: 78e7f9c0f1

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

Change-Id: I8ccba415388e719a76a7dd034273e1f3adb2c129

include/hardware/bluetooth.h

diff --git a/include/hardware/bluetooth.h b/include/hardware/bluetooth.h
index afa0eef..95a0b6e 100644
--- a/include/hardware/bluetooth.h
+++ b/include/hardware/bluetooth.h
@@ -261,6 +261,7 @@
 /** Represents the actual Out of Band data itself */
 typedef struct {
     // Both
+    bool is_valid = false; /* Default to invalid data; force caller to verify */
     uint8_t address[7]; /* Bluetooth Device Address (6) plus Address Type (1) */
     uint8_t c[16];      /* Simple Pairing Hash C-192/256 (Classic or LE) */
     uint8_t r[16];      /* Simple Pairing Randomizer R-192/256 (Classic or LE) */

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index c0b3800..930aceb 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -304,6 +304,7 @@
     KM_EC_CURVE_P_256 = 1,
     KM_EC_CURVE_P_384 = 2,
     KM_EC_CURVE_P_521 = 3,
+    KM_EC_CURVE_CURVE_25519 = 4,
 } keymaster_ec_curve_t;
 
 /**

modules/audio_remote_submix/OWNERS

diff --git a/modules/audio_remote_submix/OWNERS b/modules/audio_remote_submix/OWNERS
new file mode 100644
index 0000000..67da0f9
--- /dev/null
+++ b/modules/audio_remote_submix/OWNERS
@@ -0,0 +1,3 @@
+elaurent@google.com
+mnaganov@google.com
+jmtrivi@google.com