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

Commit 761095c9 authored by Gil Cukierman's avatar Gil Cukierman Committed by Android (Google) Code Review
Browse files

Merge "Cellular Identifier Disclosure Transparency HAL Updates" into main

parents d433451b ebc32461

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

+3 −0
Original line number Diff line number Diff line
@@ -44,4 +44,7 @@ enum NasProtocolMessage { 
  AUTHENTICATION_AND_CIPHERING_RESPONSE = 6,

  REGISTRATION_REQUEST = 7,

  DEREGISTRATION_REQUEST = 8,

  CM_REESTABLISHMENT_REQUEST = 9,

  CM_SERVICE_REQUEST = 10,

  IMSI_DETACH_INDICATION = 11,

}

radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl

+1 −3
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ oneway interface IRadioNetwork { 
     * Note: Cellular identifiers disclosed in uplink messages covered under a NAS Security Context

     * as well as identifiers disclosed in downlink messages are out of scope.

     *

     * This feature applies to 2g, 3g, 4g, and 5g (SA and NSA) messages sent before a NAS security

     * This feature applies to 2g, 3g, 4g, and 5g (SA and NSA) messages sent before a security

     * context is established. In scope message definitions and their associated spec references can

     * be found in NasProtocolMessage.

     *
@@ -678,8 +678,6 @@ oneway interface IRadioNetwork { 
     * re-enables this functionality. The modem may choose to stop tracking cellular identifiers in

     * the clear during this time.

     *

     * Note: The default value of enabled shall be true.

     *

     * @param serial Serial number of request

     * @param enabled Whether or not to enable sending indications for cellular identifiers in the

     *         clear

radio/aidl/android/hardware/radio/network/NasProtocolMessage.aidl

+10 −1
Original line number Diff line number Diff line
@@ -54,5 +54,14 @@ enum NasProtocolMessage { 
    REGISTRATION_REQUEST = 7,

    // Reference: 3GPP TS 24.501 8.2.12

    // Applies to 5g networks

    DEREGISTRATION_REQUEST = 8

    DEREGISTRATION_REQUEST = 8,

    // Reference: 3GPP TS 24.008 9.2.4

    // Applies to 2g and 3g networks

    CM_REESTABLISHMENT_REQUEST = 9,

    // Reference: 3GPP TS 24.008 9.2.9

    // Applies to 2g and 3g networks

    CM_SERVICE_REQUEST = 10,

    // Reference: 3GPP TS 24.008 9.2.14

    // Applies to 2g and 3g networks. Used for circuit-switched detach.

    IMSI_DETACH_INDICATION = 11

}

radio/aidl/vts/radio_network_test.cpp

+0 −4
Original line number Diff line number Diff line
@@ -2433,10 +2433,6 @@ TEST_P(RadioNetworkTest, isCellularIdentifierTransparencyEnabled) { 
    ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp_network->rspInfo.error,

            {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR}));



    // the default value should be true if we have not called the setter

    EXPECT_TRUE(radioRsp_network->isCellularIdentifierTransparencyEnabled);



}



TEST_P(RadioNetworkTest, setCellularIdentifierTransparencyEnabled) {