| commit | 8b12bc80203c89e11402bd56a7051a29d185ff8b | [log] [tgz] |
|---|---|---|
| author | Yomna N <yomna@google.com> | Wed Mar 19 13:31:18 2025 -0700 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 19 13:31:18 2025 -0700 |
| tree | 75d301096ad79cebf502d50872ad0284eb3d1bab | |
| parent | a7f987dd4e53b3a62b10d62fef3a2b14bd7d29f7 [diff] | |
| parent | de90b836ce9496eb1a5c3e464cf18fa75f3f76c3 [diff] |
Merge "Update usage guidelines for UNKNOWN" into main am: 60898fd63f am: de90b836ce Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3550899 Change-Id: I81b7fc03a4851185a1df37189d5621333f867530 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 */