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

Commit 569d9217 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge changes from topic "oem-paid-hal" into main am: 59dfb521 

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



Change-Id: I789ebd36fae46e169f32fde3bd8fab820ddcb772
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a2fa54aa 59dfb521

compatibility_matrices/compatibility_matrix.202504.xml

+2 −2
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ 
    </hal>

    <hal format="aidl">

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

        <version>3</version>

        <version>3-4</version>

        <interface>

            <name>IRadioData</name>

            <instance>slot1</instance>
@@ -476,7 +476,7 @@ 
    </hal>

    <hal format="aidl">

        <name>android.hardware.radio.ims.media</name>

        <version>2</version>

        <version>2-3</version>

        <interface>

            <name>IImsMedia</name>

            <instance>default</instance>

radio/aidl/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ aidl_interface { 
        },



    ],

    frozen: true,

    frozen: false,

}



aidl_interface {
@@ -320,7 +320,7 @@ aidl_interface { 
    stability: "vintf",

    imports: [

        "android.hardware.radio-V3",

        "android.hardware.radio.data-V3",

        "android.hardware.radio.data-V4",

    ],

    backend: {

        cpp: {
@@ -347,7 +347,7 @@ aidl_interface { 
        },



    ],

    frozen: true,

    frozen: false,

}



aidl_interface {

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

+2 −0
Original line number Diff line number Diff line
@@ -52,4 +52,6 @@ enum ApnTypes { 
  BIP = (1 << 13) /* 8192 */,

  ENTERPRISE = (1 << 14) /* 16384 */,

  RCS = (1 << 15) /* 32768 */,

  OEM_PAID = (1 << 16) /* 65536 */,

  OEM_PRIVATE = (1 << 17) /* 131072 */,

}

radio/aidl/android/hardware/radio/data/ApnTypes.aidl

+2 −6
Original line number Diff line number Diff line
@@ -91,16 +91,12 @@ enum ApnTypes { 
     * APN type for RCS (Rich Communication Services)

     */

    RCS = 1 << 15,



    /**

     * APN type for OEM_PAID networks (Automotive PANS)

     */

    // TODO(b/366194627): enable once HAL unfreezes

    // OEM_PAID = 1 << 16,



    OEM_PAID = 1 << 16,

    /**

     * APN type for OEM_PRIVATE networks (Automotive PANS)

     */

    // TODO(b/366194627): enable once HAL unfreezes

    // OEM_PRIVATE = 1 << 17,

    OEM_PRIVATE = 1 << 17,

}

radio/aidl/compat/libradiocompat/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ cc_library { 
        "android.hardware.radio.config@1.1",

        "android.hardware.radio.config@1.2",

        "android.hardware.radio.config@1.3",

        "android.hardware.radio.data-V3-ndk",

        "android.hardware.radio.data-V4-ndk",

        "android.hardware.radio.ims-V2-ndk",

        "android.hardware.radio.ims.media-V2-ndk",

        "android.hardware.radio.ims.media-V3-ndk",

        "android.hardware.radio.messaging-V3-ndk",

        "android.hardware.radio.modem-V3-ndk",

        "android.hardware.radio.network-V3-ndk",