commit 30ea5fc6c4b8db4691cdab4a9ba409faed31a53f
author Steven Moreland <smoreland@google.com> Tue Apr 11 22:27:24 2023 +0000
committer Steven Moreland <smoreland@google.com> Thu Apr 13 18:04:47 2023 +0000
tree fc2e954630df3a200a4ee9f3b02cd1e9fd45c763
parent 825492488b99621d9912c21a1df53fea52ab2633

move to radio V3

see hardware/interfaces CL for details

Bug: 277379745
Test: build
Change-Id: I29750cd37eed472f11fbf698f33f064d56b4c68d

Android.bp

diff --git a/Android.bp b/Android.bp
index 5027635..a3adf5c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -83,15 +83,15 @@
         "android.hardware.radio-V1.4-java",
         "android.hardware.radio-V1.5-java",
         "android.hardware.radio-V1.6-java",
-        "android.hardware.radio.config-V2-java",
-        "android.hardware.radio.data-V2-java",
-        "android.hardware.radio.ims-V1-java",
-        "android.hardware.radio.messaging-V2-java",
-        "android.hardware.radio.modem-V2-java",
-        "android.hardware.radio.network-V2-java",
-        "android.hardware.radio.sim-V2-java",
+        "android.hardware.radio.config-V3-java",
+        "android.hardware.radio.data-V3-java",
+        "android.hardware.radio.ims-V2-java",
+        "android.hardware.radio.messaging-V3-java",
+        "android.hardware.radio.modem-V3-java",
+        "android.hardware.radio.network-V3-java",
+        "android.hardware.radio.sim-V3-java",
         "android.hardware.radio.satellite-V1-java",
-        "android.hardware.radio.voice-V2-java",
+        "android.hardware.radio.voice-V3-java",
         "voip-common",
         "ims-common",
         "unsupportedappusage",

src/java/com/android/internal/telephony/RIL.java

diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index c3b9fbc..245bf68 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -7431,6 +7431,7 @@
         switch (interfaceVersion) {
             case 1: return RADIO_HAL_VERSION_2_0;
             case 2: return RADIO_HAL_VERSION_2_1;
+            case 3: return RADIO_HAL_VERSION_2_1; // for now
             default: return RADIO_HAL_VERSION_UNKNOWN;
         }
     }