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

Commit 8001cc05 authored by Sewook Seo's avatar Sewook Seo
Browse files

[conflict] Merge "Revert "Radio HAL : Support N3IWF"" am: eab578f9 

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



Change-Id: I09144e6b79b4f50f6b52043a0a98119e80e6f721
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b3c4cb7b eab578f9

compatibility_matrices/compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ 
    </hal>

    <hal format="aidl" optional="true">

        <name>android.hardware.radio.data</name>

        <version>2</version>

        <version>1</version>

        <interface>

            <name>IRadioData</name>

            <instance>slot1</instance>

radio/aidl/Android.bp

+14 −14
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ aidl_interface { 
    host_supported: true,

    srcs: ["android/hardware/radio/config/*.aidl"],

    stability: "vintf",

    imports: ["android.hardware.radio-V2"],

    imports: ["android.hardware.radio-V1"],

    backend: {

        cpp: {

            enabled: true,
@@ -48,7 +48,7 @@ aidl_interface { 
    versions_with_info: [

        {

            version: "1",

            imports: ["android.hardware.radio-V2"],

            imports: ["android.hardware.radio-V1"],

        },

    ],
@@ -60,7 +60,7 @@ aidl_interface { 
    host_supported: true,

    srcs: ["android/hardware/radio/data/*.aidl"],

    stability: "vintf",

    imports: ["android.hardware.radio-V2"],

    imports: ["android.hardware.radio-V1"],

    backend: {

        cpp: {

            enabled: true,
@@ -72,7 +72,7 @@ aidl_interface { 
    versions_with_info: [

        {

            version: "1",

            imports: ["android.hardware.radio-V2"],

            imports: ["android.hardware.radio-V1"],

        },

    ],
@@ -84,7 +84,7 @@ aidl_interface { 
    host_supported: true,

    srcs: ["android/hardware/radio/messaging/*.aidl"],

    stability: "vintf",

    imports: ["android.hardware.radio-V2"],

    imports: ["android.hardware.radio-V1"],

    backend: {

        cpp: {

            enabled: true,
@@ -96,7 +96,7 @@ aidl_interface { 
    versions_with_info: [

        {

            version: "1",

            imports: ["android.hardware.radio-V2"],

            imports: ["android.hardware.radio-V1"],

        },

    ],
@@ -108,7 +108,7 @@ aidl_interface { 
    host_supported: true,

    srcs: ["android/hardware/radio/modem/*.aidl"],

    stability: "vintf",

    imports: ["android.hardware.radio-V2"],

    imports: ["android.hardware.radio-V1"],

    backend: {

        cpp: {

            enabled: true,
@@ -120,7 +120,7 @@ aidl_interface { 
    versions_with_info: [

        {

            version: "1",

            imports: ["android.hardware.radio-V2"],

            imports: ["android.hardware.radio-V1"],

        },

    ],
@@ -133,7 +133,7 @@ aidl_interface { 
    vndk_use_version: "2",

    srcs: ["android/hardware/radio/network/*.aidl"],

    stability: "vintf",

    imports: ["android.hardware.radio-V2"],

    imports: ["android.hardware.radio-V1"],

    backend: {

        cpp: {

            enabled: true,
@@ -145,7 +145,7 @@ aidl_interface { 
    versions_with_info: [

        {

            version: "1",

            imports: ["android.hardware.radio-V2"],

            imports: ["android.hardware.radio-V1"],

        },

    ],
@@ -158,7 +158,7 @@ aidl_interface { 
    srcs: ["android/hardware/radio/sim/*.aidl"],

    stability: "vintf",

    imports: [

        "android.hardware.radio-V2",

        "android.hardware.radio-V1",

        "android.hardware.radio.config",

    ],

    backend: {
@@ -173,7 +173,7 @@ aidl_interface { 
        {

            version: "1",

            imports: [

                "android.hardware.radio-V2",

                "android.hardware.radio-V1",

                "android.hardware.radio.config-V1",

            ],

        },
@@ -187,7 +187,7 @@ aidl_interface { 
    host_supported: true,

    srcs: ["android/hardware/radio/voice/*.aidl"],

    stability: "vintf",

    imports: ["android.hardware.radio-V2"],

    imports: ["android.hardware.radio-V1"],

    backend: {

        cpp: {

            enabled: true,
@@ -199,7 +199,7 @@ aidl_interface { 
    versions_with_info: [

        {

            version: "1",

            imports: ["android.hardware.radio-V2"],

            imports: ["android.hardware.radio-V1"],

        },

    ],

radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/IRadioDataIndication.aidl

+0 −4
Original line number Diff line number Diff line
@@ -37,10 +37,6 @@ interface IRadioDataIndication { 
  oneway void dataCallListChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.data.SetupDataCallResult[] dcList);

  oneway void keepaliveStatus(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.data.KeepaliveStatus status);

  oneway void pcoData(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.data.PcoDataInfo pco);

  /**

   * @deprecated use unthrottleDataProfile to clarify access network for this event.

   */

  oneway void unthrottleApn(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.data.DataProfileInfo dataProfileInfo);

  oneway void slicingConfigChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.data.SlicingConfig slicingConfig);

  oneway void unthrottleDataProfile(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.AccessNetwork accessNetwork, in android.hardware.radio.data.DataProfileInfo dataProfileInfo);

}

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

+0 −7
Original line number Diff line number Diff line
@@ -40,9 +40,6 @@ interface IRadioNetwork { 
  oneway void getBarringInfo(in int serial);

  oneway void getCdmaRoamingPreference(in int serial);

  oneway void getCellInfoList(in int serial);

  /**

   * @deprecated use getRegistrationState()

   */

  oneway void getDataRegistrationState(in int serial);

  oneway void getImsRegistrationState(in int serial);

  oneway void getNetworkSelectionMode(in int serial);
@@ -50,9 +47,6 @@ interface IRadioNetwork { 
  oneway void getSignalStrength(in int serial);

  oneway void getSystemSelectionChannels(in int serial);

  oneway void getVoiceRadioTechnology(in int serial);

  /**

   * @deprecated use getRegistrationState()

   */

  oneway void getVoiceRegistrationState(in int serial);

  oneway void isNrDualConnectivityEnabled(in int serial);

  oneway void responseAcknowledgement();
@@ -80,5 +74,4 @@ interface IRadioNetwork { 
  oneway void triggerEmergencyNetworkScan(int serial, in android.hardware.radio.network.EmergencyNetworkScanTrigger request);

  oneway void cancelEmergencyNetworkScan(in int serial);

  oneway void exitEmergencyMode(in int serial);

  oneway void getRegistrationState(in int serial, in android.hardware.radio.RadioTechnologyFamily ratFamily, in android.hardware.radio.network.Domain domain);

}

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

+0 −7
Original line number Diff line number Diff line
@@ -41,9 +41,6 @@ interface IRadioNetworkResponse { 
  oneway void getBarringInfoResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.CellIdentity cellIdentity, in android.hardware.radio.network.BarringInfo[] barringInfos);

  oneway void getCdmaRoamingPreferenceResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.CdmaRoamingType type);

  oneway void getCellInfoListResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.CellInfo[] cellInfo);

  /**

   * @deprecated use getRegistrationStateResponse()

   */

  oneway void getDataRegistrationStateResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.RegStateResult dataRegResponse);

  oneway void getImsRegistrationStateResponse(in android.hardware.radio.RadioResponseInfo info, in boolean isRegistered, in android.hardware.radio.RadioTechnologyFamily ratFamily);

  oneway void getNetworkSelectionModeResponse(in android.hardware.radio.RadioResponseInfo info, in boolean manual);
@@ -51,9 +48,6 @@ interface IRadioNetworkResponse { 
  oneway void getSignalStrengthResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.SignalStrength signalStrength);

  oneway void getSystemSelectionChannelsResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.RadioAccessSpecifier[] specifiers);

  oneway void getVoiceRadioTechnologyResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.RadioTechnology rat);

  /**

   * @deprecated use getRegistrationStateResponse()

   */

  oneway void getVoiceRegistrationStateResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.RegStateResult voiceRegResponse);

  oneway void isNrDualConnectivityEnabledResponse(in android.hardware.radio.RadioResponseInfo info, in boolean isEnabled);

  oneway void setAllowedNetworkTypesBitmapResponse(in android.hardware.radio.RadioResponseInfo info);
@@ -79,5 +73,4 @@ interface IRadioNetworkResponse { 
  oneway void triggerEmergencyNetworkScanResponse(in android.hardware.radio.RadioResponseInfo info);

  oneway void exitEmergencyModeResponse(in android.hardware.radio.RadioResponseInfo info);

  oneway void cancelEmergencyNetworkScanResponse(in android.hardware.radio.RadioResponseInfo info);

  oneway void getRegistrationStateResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.RegStateResult regResponse);

}