Snap for 13248265 from eab72dff1d3129c6f0ae71a865859b4d20a6dc4b to 25Q2-release
Change-Id: I9ff13eaa23795497fc384996b5150c2c8e843cc0
diff --git a/contexthub/aidl/android/hardware/contexthub/IEndpointCommunication.aidl b/contexthub/aidl/android/hardware/contexthub/IEndpointCommunication.aidl
index e5045ba..2092cd3 100644
--- a/contexthub/aidl/android/hardware/contexthub/IEndpointCommunication.aidl
+++ b/contexthub/aidl/android/hardware/contexthub/IEndpointCommunication.aidl
@@ -62,7 +62,9 @@
*
* Upon returning from this function, the session is in pending state, and the final result will
* be given by an asynchronous call to onEndpointSessionOpenComplete() on success, or
- * onCloseEndpointSession() on failure.
+ * onCloseEndpointSession() on failure. If a call to onEndpointSessionOpenComplete() is not
+ * received within 10 seconds, the session will be considered failed and
+ * onCloseEndpointSession() should be called with reason Reason.TIMEOUT.
*
* @param sessionId Caller-allocated session identifier, which must be unique across all active
* sessions, and must fall in a range allocated via requestSessionIdRange().
diff --git a/radio/aidl/android/hardware/radio/network/SecurityAlgorithm.aidl b/radio/aidl/android/hardware/radio/network/SecurityAlgorithm.aidl
index 451eaa9..5825395 100644
--- a/radio/aidl/android/hardware/radio/network/SecurityAlgorithm.aidl
+++ b/radio/aidl/android/hardware/radio/network/SecurityAlgorithm.aidl
@@ -88,8 +88,12 @@
ENCR_AES_CBC = 100,
AUTH_HMAC_SHA2_256_128 = 101,
- /** Unknown */
+ /** Misc placeholders */
+ // Unknown is now reserved for cases involving DRBs where an integrity algorithm
+ // is not assigned (which is different from a null algorithm being used) but a
+ // notification based solely on the integrity algorithm should not be triggered.
UNKNOWN = 113,
+ // Currently unused
OTHER = 114,
/** For proprietary algorithms */