Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4cd70fb authored by Gil Cukierman's avatar Gil Cukierman
Browse files

Fix 2g and 3g ConnectionEvent 

In 2g and 3g there is no separate ciphering and integrity algorithms on the non-access stratum vs. the access stratum. Instead, there is potentially a different ciphering algorithm on circuit switched vs. packet services.

Bug: 283336425

Change-Id: I06dbeec1b01dbfdb6b6f541a3c8544fe6bc26fe4
Test: atest VtsHalRadioTargetTest
parent bf47fa6e

radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/ConnectionEvent.aidl

+12 −14
Original line number Diff line number Diff line
@@ -35,18 +35,16 @@ package android.hardware.radio.network; 
/* @hide */

@Backing(type="int") @JavaDerive(toString=true) @VintfStability

enum ConnectionEvent {

  CS_SERVICE_GSM = 0,

  SIGNALLING_GSM = 1,

  PS_SERVICE_GPRS = 2,

  SIGNALLING_GPRS = 3,

  PS_SERVICE_3G = 4,

  SIGNALLING_3G = 5,

  NAS_SIGNALLING_LTE = 6,

  AS_SIGNALLING_LTE = 7,

  VOLTE_SIP = 8,

  VOLTE_RTP = 9,

  NAS_SIGNALLING_5G = 10,

  AS_SIGNALLING_5G = 11,

  VONR_SIP = 12,

  VONR_RTP = 13,

  CS_SIGNALLING_GSM = 0,

  PS_SIGNALLING_GPRS = 1,

  CS_SIGNALLING_3G = 2,

  PS_SIGNALLING_3G = 3,

  NAS_SIGNALLING_LTE = 4,

  AS_SIGNALLING_LTE = 5,

  VOLTE_SIP = 6,

  VOLTE_RTP = 7,

  NAS_SIGNALLING_5G = 8,

  AS_SIGNALLING_5G = 9,

  VONR_SIP = 10,

  VONR_RTP = 11,

}

radio/aidl/android/hardware/radio/network/ConnectionEvent.aidl

+16 −16
Original line number Diff line number Diff line
@@ -25,31 +25,31 @@ package android.hardware.radio.network; 
@Backing(type="int")

@JavaDerive(toString=true)

enum ConnectionEvent {

    // 2G GSM

    CS_SERVICE_GSM = 0,

    SIGNALLING_GSM = 1,

    // 2G GSM circuit switched

    CS_SIGNALLING_GSM = 0,



    // 2G GPRS packet services

    PS_SERVICE_GPRS = 2,

    SIGNALLING_GPRS = 3,

    PS_SIGNALLING_GPRS = 1,



    // 3G packet services

    PS_SERVICE_3G = 4,

    SIGNALLING_3G = 5,

    // 3G circuit switched

    CS_SIGNALLING_3G = 2,



    // 3G packet switched

    PS_SIGNALLING_3G = 3,



    // 4G LTE packet services

    NAS_SIGNALLING_LTE = 6,

    AS_SIGNALLING_LTE = 7,

    NAS_SIGNALLING_LTE = 4,

    AS_SIGNALLING_LTE = 5,



    // VoLTE

    VOLTE_SIP = 8,

    VOLTE_RTP = 9,

    VOLTE_SIP = 6,

    VOLTE_RTP = 7,



    // 5G packet services

    NAS_SIGNALLING_5G = 10,

    AS_SIGNALLING_5G = 11,

    NAS_SIGNALLING_5G = 8,

    AS_SIGNALLING_5G = 9,



    // VoNR

    VONR_SIP = 12,

    VONR_RTP = 13,

    VONR_SIP = 10,

    VONR_RTP = 11,

}