diff --git a/radio/aidl/Android.bp b/radio/aidl/Android.bp
index a79c807..53ef145 100644
--- a/radio/aidl/Android.bp
+++ b/radio/aidl/Android.bp
@@ -36,13 +36,9 @@
             version: "3",
             imports: [],
         },
-        {
-            version: "4",
-            imports: [],
-        },
 
     ],
-    frozen: true,
+    frozen: false,
 
 }
 
@@ -75,13 +71,9 @@
             version: "3",
             imports: ["android.hardware.radio-V3"],
         },
-        {
-            version: "4",
-            imports: ["android.hardware.radio-V4"],
-        },
 
     ],
-    frozen: true,
+    frozen: false,
 
 }
 
@@ -114,13 +106,9 @@
             version: "3",
             imports: ["android.hardware.radio-V3"],
         },
-        {
-            version: "4",
-            imports: ["android.hardware.radio-V4"],
-        },
 
     ],
-    frozen: true,
+    frozen: false,
 }
 
 aidl_interface {
@@ -152,13 +140,9 @@
             version: "3",
             imports: ["android.hardware.radio-V3"],
         },
-        {
-            version: "4",
-            imports: ["android.hardware.radio-V4"],
-        },
 
     ],
-    frozen: true,
+    frozen: false,
 }
 
 aidl_interface {
@@ -190,13 +174,9 @@
             version: "3",
             imports: ["android.hardware.radio-V3"],
         },
-        {
-            version: "4",
-            imports: ["android.hardware.radio-V4"],
-        },
 
     ],
-    frozen: true,
+    frozen: false,
 }
 
 aidl_interface {
@@ -228,13 +208,9 @@
             version: "3",
             imports: ["android.hardware.radio-V3"],
         },
-        {
-            version: "4",
-            imports: ["android.hardware.radio-V4"],
-        },
 
     ],
-    frozen: true,
+    frozen: false,
 }
 
 aidl_interface {
@@ -307,16 +283,9 @@
                 "android.hardware.radio.config-V3",
             ],
         },
-        {
-            version: "4",
-            imports: [
-                "android.hardware.radio-V4",
-                "android.hardware.radio.config-V4",
-            ],
-        },
 
     ],
-    frozen: true,
+    frozen: false,
 }
 
 aidl_interface {
@@ -348,13 +317,9 @@
             version: "3",
             imports: ["android.hardware.radio-V3"],
         },
-        {
-            version: "4",
-            imports: ["android.hardware.radio-V4"],
-        },
 
     ],
-    frozen: true,
+    frozen: false,
 }
 
 aidl_interface {
@@ -390,16 +355,9 @@
                 "android.hardware.radio.data-V3",
             ],
         },
-        {
-            version: "3",
-            imports: [
-                "android.hardware.radio-V4",
-                "android.hardware.radio.data-V4",
-            ],
-        },
 
     ],
-    frozen: true,
+    frozen: false,
 }
 
 aidl_interface {
@@ -426,11 +384,7 @@
             version: "2",
             imports: ["android.hardware.radio-V3"],
         },
-        {
-            version: "3",
-            imports: ["android.hardware.radio-V4"],
-        },
 
     ],
-    frozen: true,
+    frozen: false,
 }
diff --git a/radio/aidl/aidl_api/android.hardware.radio.config/4/.hash b/radio/aidl/aidl_api/android.hardware.radio.config/4/.hash
deleted file mode 100644
index 93c3946..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.config/4/.hash
+++ /dev/null
@@ -1 +0,0 @@
-9aea354866e9c4f3f93f546066b392bc1de95310
diff --git a/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/IRadioConfig.aidl b/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/IRadioConfig.aidl
deleted file mode 100644
index bba6bdd..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/IRadioConfig.aidl
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- * This interface is used by telephony and telecom to talk to cellular radio for the purpose of
- * radio configuration, and it is not associated with any specific modem or slot.
- * All the functions have minimum one parameter:
- * serial: which corresponds to the serial number of the request. Serial numbers must only be
- * memorized for the duration of a method call. If clients provide colliding serials (including
- * passing the same serial to different methods), multiple responses (one for each method call) must
- * still be served.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.config;
-/* @hide */
-@VintfStability
-interface IRadioConfig {
-  oneway void getHalDeviceCapabilities(in int serial);
-  oneway void getNumOfLiveModems(in int serial);
-  oneway void getPhoneCapability(in int serial);
-  oneway void getSimSlotsStatus(in int serial);
-  oneway void setNumOfLiveModems(in int serial, in byte numOfLiveModems);
-  oneway void setPreferredDataModem(in int serial, in byte modemId);
-  oneway void setResponseFunctions(in android.hardware.radio.config.IRadioConfigResponse radioConfigResponse, in android.hardware.radio.config.IRadioConfigIndication radioConfigIndication);
-  oneway void setSimSlotsMapping(in int serial, in android.hardware.radio.config.SlotPortMapping[] slotMap);
-  oneway void getSimultaneousCallingSupport(in int serial);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/IRadioConfigIndication.aidl b/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/IRadioConfigIndication.aidl
deleted file mode 100644
index f786373..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/IRadioConfigIndication.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.config;
-/* @hide */
-@VintfStability
-interface IRadioConfigIndication {
-  oneway void simSlotsStatusChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.config.SimSlotStatus[] slotStatus);
-  oneway void onSimultaneousCallingSupportChanged(in int[] enabledLogicalSlots);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/IRadioConfigResponse.aidl b/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/IRadioConfigResponse.aidl
deleted file mode 100644
index 6ff7bd0..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/IRadioConfigResponse.aidl
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.config;
-/* @hide */
-@VintfStability
-interface IRadioConfigResponse {
-  oneway void getHalDeviceCapabilitiesResponse(in android.hardware.radio.RadioResponseInfo info, in boolean modemReducedFeatureSet1);
-  oneway void getNumOfLiveModemsResponse(in android.hardware.radio.RadioResponseInfo info, in byte numOfLiveModems);
-  oneway void getPhoneCapabilityResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.config.PhoneCapability phoneCapability);
-  oneway void getSimSlotsStatusResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.config.SimSlotStatus[] slotStatus);
-  oneway void setNumOfLiveModemsResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setPreferredDataModemResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setSimSlotsMappingResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void getSimultaneousCallingSupportResponse(in android.hardware.radio.RadioResponseInfo info, in int[] enabledLogicalSlots);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/MultipleEnabledProfilesMode.aidl b/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/MultipleEnabledProfilesMode.aidl
deleted file mode 100644
index 41c4201..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/MultipleEnabledProfilesMode.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.config;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum MultipleEnabledProfilesMode {
-  NONE,
-  MEP_A1,
-  MEP_A2,
-  MEP_B,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/PhoneCapability.aidl b/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/PhoneCapability.aidl
deleted file mode 100644
index 2c66abd..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/PhoneCapability.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.config;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable PhoneCapability {
-  byte maxActiveData;
-  byte maxActiveInternetData;
-  boolean isInternetLingeringSupported;
-  byte[] logicalModemIds;
-  byte maxActiveVoice = UNKNOWN /* -1 */;
-  const byte UNKNOWN = (-1) /* -1 */;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/SimPortInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/SimPortInfo.aidl
deleted file mode 100644
index ede3189..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/SimPortInfo.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.config;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable SimPortInfo {
-  String iccId;
-  int logicalSlotId;
-  boolean portActive;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/SimSlotStatus.aidl b/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/SimSlotStatus.aidl
deleted file mode 100644
index e84e7d4..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/SimSlotStatus.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.config;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable SimSlotStatus {
-  int cardState;
-  String atr;
-  String eid;
-  android.hardware.radio.config.SimPortInfo[] portInfo;
-  android.hardware.radio.config.MultipleEnabledProfilesMode supportedMepMode = android.hardware.radio.config.MultipleEnabledProfilesMode.NONE;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/SlotPortMapping.aidl b/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/SlotPortMapping.aidl
deleted file mode 100644
index 5278e79..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.config/4/android/hardware/radio/config/SlotPortMapping.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.config;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable SlotPortMapping {
-  int physicalSlotId;
-  int portId;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/.hash b/radio/aidl/aidl_api/android.hardware.radio.data/4/.hash
deleted file mode 100644
index 0945e7c..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/.hash
+++ /dev/null
@@ -1 +0,0 @@
-6991f631ef08615852bd7708d9d9bcae21bc69c7
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/ApnAuthType.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/ApnAuthType.aidl
deleted file mode 100644
index eed8170..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/ApnAuthType.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum ApnAuthType {
-  NO_PAP_NO_CHAP,
-  PAP_NO_CHAP,
-  NO_PAP_CHAP,
-  PAP_CHAP,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/ApnTypes.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/ApnTypes.aidl
deleted file mode 100644
index 27561b9..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/ApnTypes.aidl
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum ApnTypes {
-  NONE = 0,
-  DEFAULT = (1 << 0) /* 1 */,
-  MMS = (1 << 1) /* 2 */,
-  SUPL = (1 << 2) /* 4 */,
-  DUN = (1 << 3) /* 8 */,
-  HIPRI = (1 << 4) /* 16 */,
-  FOTA = (1 << 5) /* 32 */,
-  IMS = (1 << 6) /* 64 */,
-  CBS = (1 << 7) /* 128 */,
-  IA = (1 << 8) /* 256 */,
-  EMERGENCY = (1 << 9) /* 512 */,
-  MCX = (1 << 10) /* 1024 */,
-  XCAP = (1 << 11) /* 2048 */,
-  VSIM = (1 << 12) /* 4096 */,
-  BIP = (1 << 13) /* 8192 */,
-  ENTERPRISE = (1 << 14) /* 16384 */,
-  RCS = (1 << 15) /* 32768 */,
-  OEM_PAID = (1 << 16) /* 65536 */,
-  OEM_PRIVATE = (1 << 17) /* 131072 */,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/DataCallFailCause.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/DataCallFailCause.aidl
deleted file mode 100644
index a0ca4bf..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/DataCallFailCause.aidl
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-enum DataCallFailCause {
-  NONE = 0,
-  OPERATOR_BARRED = 0x08,
-  NAS_SIGNALLING = 0x0E,
-  INSUFFICIENT_RESOURCES = 0x1A,
-  MISSING_UNKNOWN_APN = 0x1B,
-  UNKNOWN_PDP_ADDRESS_TYPE = 0x1C,
-  USER_AUTHENTICATION = 0x1D,
-  ACTIVATION_REJECT_GGSN = 0x1E,
-  ACTIVATION_REJECT_UNSPECIFIED = 0x1F,
-  SERVICE_OPTION_NOT_SUPPORTED = 0x20,
-  SERVICE_OPTION_NOT_SUBSCRIBED = 0x21,
-  SERVICE_OPTION_OUT_OF_ORDER = 0x22,
-  NSAPI_IN_USE = 0x23,
-  REGULAR_DEACTIVATION = 0x24,
-  QOS_NOT_ACCEPTED = 0x25,
-  NETWORK_FAILURE = 0x26,
-  UMTS_REACTIVATION_REQ = 0x27,
-  FEATURE_NOT_SUPP = 0x28,
-  TFT_SEMANTIC_ERROR = 0x29,
-  TFT_SYTAX_ERROR = 0x2A,
-  UNKNOWN_PDP_CONTEXT = 0x2B,
-  FILTER_SEMANTIC_ERROR = 0x2C,
-  FILTER_SYTAX_ERROR = 0x2D,
-  PDP_WITHOUT_ACTIVE_TFT = 0x2E,
-  ONLY_IPV4_ALLOWED = 0x32,
-  ONLY_IPV6_ALLOWED = 0x33,
-  ONLY_SINGLE_BEARER_ALLOWED = 0x34,
-  ESM_INFO_NOT_RECEIVED = 0x35,
-  PDN_CONN_DOES_NOT_EXIST = 0x36,
-  MULTI_CONN_TO_SAME_PDN_NOT_ALLOWED = 0x37,
-  MAX_ACTIVE_PDP_CONTEXT_REACHED = 0x41,
-  UNSUPPORTED_APN_IN_CURRENT_PLMN = 0x42,
-  INVALID_TRANSACTION_ID = 0x51,
-  MESSAGE_INCORRECT_SEMANTIC = 0x5F,
-  INVALID_MANDATORY_INFO = 0x60,
-  MESSAGE_TYPE_UNSUPPORTED = 0x61,
-  MSG_TYPE_NONCOMPATIBLE_STATE = 0x62,
-  UNKNOWN_INFO_ELEMENT = 0x63,
-  CONDITIONAL_IE_ERROR = 0x64,
-  MSG_AND_PROTOCOL_STATE_UNCOMPATIBLE = 0x65,
-  PROTOCOL_ERRORS = 0x6F,
-  APN_TYPE_CONFLICT = 0x70,
-  INVALID_PCSCF_ADDR = 0x71,
-  INTERNAL_CALL_PREEMPT_BY_HIGH_PRIO_APN = 0x72,
-  EMM_ACCESS_BARRED = 0x73,
-  EMERGENCY_IFACE_ONLY = 0x74,
-  IFACE_MISMATCH = 0x75,
-  COMPANION_IFACE_IN_USE = 0x76,
-  IP_ADDRESS_MISMATCH = 0x77,
-  IFACE_AND_POL_FAMILY_MISMATCH = 0x78,
-  EMM_ACCESS_BARRED_INFINITE_RETRY = 0x79,
-  AUTH_FAILURE_ON_EMERGENCY_CALL = 0x7A,
-  OEM_DCFAILCAUSE_1 = 0x1001,
-  OEM_DCFAILCAUSE_2 = 0x1002,
-  OEM_DCFAILCAUSE_3 = 0x1003,
-  OEM_DCFAILCAUSE_4 = 0x1004,
-  OEM_DCFAILCAUSE_5 = 0x1005,
-  OEM_DCFAILCAUSE_6 = 0x1006,
-  OEM_DCFAILCAUSE_7 = 0x1007,
-  OEM_DCFAILCAUSE_8 = 0x1008,
-  OEM_DCFAILCAUSE_9 = 0x1009,
-  OEM_DCFAILCAUSE_10 = 0x100A,
-  OEM_DCFAILCAUSE_11 = 0x100B,
-  OEM_DCFAILCAUSE_12 = 0x100C,
-  OEM_DCFAILCAUSE_13 = 0x100D,
-  OEM_DCFAILCAUSE_14 = 0x100E,
-  OEM_DCFAILCAUSE_15 = 0x100F,
-  VOICE_REGISTRATION_FAIL = (-1) /* -1 */,
-  DATA_REGISTRATION_FAIL = (-2) /* -2 */,
-  SIGNAL_LOST = (-3) /* -3 */,
-  PREF_RADIO_TECH_CHANGED = (-4) /* -4 */,
-  RADIO_POWER_OFF = (-5) /* -5 */,
-  TETHERED_CALL_ACTIVE = (-6) /* -6 */,
-  ERROR_UNSPECIFIED = 0xffff,
-  LLC_SNDCP = 0x19,
-  ACTIVATION_REJECTED_BCM_VIOLATION = 0x30,
-  COLLISION_WITH_NETWORK_INITIATED_REQUEST = 0x38,
-  ONLY_IPV4V6_ALLOWED = 0x39,
-  ONLY_NON_IP_ALLOWED = 0x3A,
-  UNSUPPORTED_QCI_VALUE = 0x3B,
-  BEARER_HANDLING_NOT_SUPPORTED = 0x3C,
-  INVALID_DNS_ADDR = 0x7B,
-  INVALID_PCSCF_OR_DNS_ADDRESS = 0x7C,
-  CALL_PREEMPT_BY_EMERGENCY_APN = 0x7F,
-  UE_INITIATED_DETACH_OR_DISCONNECT = 0x80,
-  MIP_FA_REASON_UNSPECIFIED = 0x7D0,
-  MIP_FA_ADMIN_PROHIBITED = 0x7D1,
-  MIP_FA_INSUFFICIENT_RESOURCES = 0x7D2,
-  MIP_FA_MOBILE_NODE_AUTHENTICATION_FAILURE = 0x7D3,
-  MIP_FA_HOME_AGENT_AUTHENTICATION_FAILURE = 0x7D4,
-  MIP_FA_REQUESTED_LIFETIME_TOO_LONG = 0x7D5,
-  MIP_FA_MALFORMED_REQUEST = 0x7D6,
-  MIP_FA_MALFORMED_REPLY = 0x7D7,
-  MIP_FA_ENCAPSULATION_UNAVAILABLE = 0x7D8,
-  MIP_FA_VJ_HEADER_COMPRESSION_UNAVAILABLE = 0x7D9,
-  MIP_FA_REVERSE_TUNNEL_UNAVAILABLE = 0x7DA,
-  MIP_FA_REVERSE_TUNNEL_IS_MANDATORY = 0x7DB,
-  MIP_FA_DELIVERY_STYLE_NOT_SUPPORTED = 0x7DC,
-  MIP_FA_MISSING_NAI = 0x7DD,
-  MIP_FA_MISSING_HOME_AGENT = 0x7DE,
-  MIP_FA_MISSING_HOME_ADDRESS = 0x7DF,
-  MIP_FA_UNKNOWN_CHALLENGE = 0x7E0,
-  MIP_FA_MISSING_CHALLENGE = 0x7E1,
-  MIP_FA_STALE_CHALLENGE = 0x7E2,
-  MIP_HA_REASON_UNSPECIFIED = 0x7E3,
-  MIP_HA_ADMIN_PROHIBITED = 0x7E4,
-  MIP_HA_INSUFFICIENT_RESOURCES = 0x7E5,
-  MIP_HA_MOBILE_NODE_AUTHENTICATION_FAILURE = 0x7E6,
-  MIP_HA_FOREIGN_AGENT_AUTHENTICATION_FAILURE = 0x7E7,
-  MIP_HA_REGISTRATION_ID_MISMATCH = 0x7E8,
-  MIP_HA_MALFORMED_REQUEST = 0x7E9,
-  MIP_HA_UNKNOWN_HOME_AGENT_ADDRESS = 0x7EA,
-  MIP_HA_REVERSE_TUNNEL_UNAVAILABLE = 0x7EB,
-  MIP_HA_REVERSE_TUNNEL_IS_MANDATORY = 0x7EC,
-  MIP_HA_ENCAPSULATION_UNAVAILABLE = 0x7ED,
-  CLOSE_IN_PROGRESS = 0x7EE,
-  NETWORK_INITIATED_TERMINATION = 0x7EF,
-  MODEM_APP_PREEMPTED = 0x7F0,
-  PDN_IPV4_CALL_DISALLOWED = 0x7F1,
-  PDN_IPV4_CALL_THROTTLED = 0x7F2,
-  PDN_IPV6_CALL_DISALLOWED = 0x7F3,
-  PDN_IPV6_CALL_THROTTLED = 0x7F4,
-  MODEM_RESTART = 0x7F5,
-  PDP_PPP_NOT_SUPPORTED = 0x7F6,
-  UNPREFERRED_RAT = 0x7F7,
-  PHYSICAL_LINK_CLOSE_IN_PROGRESS = 0x7F8,
-  APN_PENDING_HANDOVER = 0x7F9,
-  PROFILE_BEARER_INCOMPATIBLE = 0x7FA,
-  SIM_CARD_CHANGED = 0x7FB,
-  LOW_POWER_MODE_OR_POWERING_DOWN = 0x7FC,
-  APN_DISABLED = 0x7FD,
-  MAX_PPP_INACTIVITY_TIMER_EXPIRED = 0x7FE,
-  IPV6_ADDRESS_TRANSFER_FAILED = 0x7FF,
-  TRAT_SWAP_FAILED = 0x800,
-  EHRPD_TO_HRPD_FALLBACK = 0x801,
-  MIP_CONFIG_FAILURE = 0x802,
-  PDN_INACTIVITY_TIMER_EXPIRED = 0x803,
-  MAX_IPV4_CONNECTIONS = 0x804,
-  MAX_IPV6_CONNECTIONS = 0x805,
-  APN_MISMATCH = 0x806,
-  IP_VERSION_MISMATCH = 0x807,
-  DUN_CALL_DISALLOWED = 0x808,
-  INTERNAL_EPC_NONEPC_TRANSITION = 0x809,
-  INTERFACE_IN_USE = 0x80A,
-  APN_DISALLOWED_ON_ROAMING = 0x80B,
-  APN_PARAMETERS_CHANGED = 0x80C,
-  NULL_APN_DISALLOWED = 0x80D,
-  THERMAL_MITIGATION = 0x80E,
-  DATA_SETTINGS_DISABLED = 0x80F,
-  DATA_ROAMING_SETTINGS_DISABLED = 0x810,
-  DDS_SWITCHED = 0x811,
-  FORBIDDEN_APN_NAME = 0x812,
-  DDS_SWITCH_IN_PROGRESS = 0x813,
-  CALL_DISALLOWED_IN_ROAMING = 0x814,
-  NON_IP_NOT_SUPPORTED = 0x815,
-  PDN_NON_IP_CALL_THROTTLED = 0x816,
-  PDN_NON_IP_CALL_DISALLOWED = 0x817,
-  CDMA_LOCK = 0x818,
-  CDMA_INTERCEPT = 0x819,
-  CDMA_REORDER = 0x81A,
-  CDMA_RELEASE_DUE_TO_SO_REJECTION = 0x81B,
-  CDMA_INCOMING_CALL = 0x81C,
-  CDMA_ALERT_STOP = 0x81D,
-  CHANNEL_ACQUISITION_FAILURE = 0x81E,
-  MAX_ACCESS_PROBE = 0x81F,
-  CONCURRENT_SERVICE_NOT_SUPPORTED_BY_BASE_STATION = 0x820,
-  NO_RESPONSE_FROM_BASE_STATION = 0x821,
-  REJECTED_BY_BASE_STATION = 0x822,
-  CONCURRENT_SERVICES_INCOMPATIBLE = 0x823,
-  NO_CDMA_SERVICE = 0x824,
-  RUIM_NOT_PRESENT = 0x825,
-  CDMA_RETRY_ORDER = 0x826,
-  ACCESS_BLOCK = 0x827,
-  ACCESS_BLOCK_ALL = 0x828,
-  IS707B_MAX_ACCESS_PROBES = 0x829,
-  THERMAL_EMERGENCY = 0x82A,
-  CONCURRENT_SERVICES_NOT_ALLOWED = 0x82B,
-  INCOMING_CALL_REJECTED = 0x82C,
-  NO_SERVICE_ON_GATEWAY = 0x82D,
-  NO_GPRS_CONTEXT = 0x82E,
-  ILLEGAL_MS = 0x82F,
-  ILLEGAL_ME = 0x830,
-  GPRS_SERVICES_AND_NON_GPRS_SERVICES_NOT_ALLOWED = 0x831,
-  GPRS_SERVICES_NOT_ALLOWED = 0x832,
-  MS_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK = 0x833,
-  IMPLICITLY_DETACHED = 0x834,
-  PLMN_NOT_ALLOWED = 0x835,
-  LOCATION_AREA_NOT_ALLOWED = 0x836,
-  GPRS_SERVICES_NOT_ALLOWED_IN_THIS_PLMN = 0x837,
-  PDP_DUPLICATE = 0x838,
-  UE_RAT_CHANGE = 0x839,
-  CONGESTION = 0x83A,
-  NO_PDP_CONTEXT_ACTIVATED = 0x83B,
-  ACCESS_CLASS_DSAC_REJECTION = 0x83C,
-  PDP_ACTIVATE_MAX_RETRY_FAILED = 0x83D,
-  RADIO_ACCESS_BEARER_FAILURE = 0x83E,
-  ESM_UNKNOWN_EPS_BEARER_CONTEXT = 0x83F,
-  DRB_RELEASED_BY_RRC = 0x840,
-  CONNECTION_RELEASED = 0x841,
-  EMM_DETACHED = 0x842,
-  EMM_ATTACH_FAILED = 0x843,
-  EMM_ATTACH_STARTED = 0x844,
-  LTE_NAS_SERVICE_REQUEST_FAILED = 0x845,
-  DUPLICATE_BEARER_ID = 0x846,
-  ESM_COLLISION_SCENARIOS = 0x847,
-  ESM_BEARER_DEACTIVATED_TO_SYNC_WITH_NETWORK = 0x848,
-  ESM_NW_ACTIVATED_DED_BEARER_WITH_ID_OF_DEF_BEARER = 0x849,
-  ESM_BAD_OTA_MESSAGE = 0x84A,
-  ESM_DOWNLOAD_SERVER_REJECTED_THE_CALL = 0x84B,
-  ESM_CONTEXT_TRANSFERRED_DUE_TO_IRAT = 0x84C,
-  DS_EXPLICIT_DEACTIVATION = 0x84D,
-  ESM_LOCAL_CAUSE_NONE = 0x84E,
-  LTE_THROTTLING_NOT_REQUIRED = 0x84F,
-  ACCESS_CONTROL_LIST_CHECK_FAILURE = 0x850,
-  SERVICE_NOT_ALLOWED_ON_PLMN = 0x851,
-  EMM_T3417_EXPIRED = 0x852,
-  EMM_T3417_EXT_EXPIRED = 0x853,
-  RRC_UPLINK_DATA_TRANSMISSION_FAILURE = 0x854,
-  RRC_UPLINK_DELIVERY_FAILED_DUE_TO_HANDOVER = 0x855,
-  RRC_UPLINK_CONNECTION_RELEASE = 0x856,
-  RRC_UPLINK_RADIO_LINK_FAILURE = 0x857,
-  RRC_UPLINK_ERROR_REQUEST_FROM_NAS = 0x858,
-  RRC_CONNECTION_ACCESS_STRATUM_FAILURE = 0x859,
-  RRC_CONNECTION_ANOTHER_PROCEDURE_IN_PROGRESS = 0x85A,
-  RRC_CONNECTION_ACCESS_BARRED = 0x85B,
-  RRC_CONNECTION_CELL_RESELECTION = 0x85C,
-  RRC_CONNECTION_CONFIG_FAILURE = 0x85D,
-  RRC_CONNECTION_TIMER_EXPIRED = 0x85E,
-  RRC_CONNECTION_LINK_FAILURE = 0x85F,
-  RRC_CONNECTION_CELL_NOT_CAMPED = 0x860,
-  RRC_CONNECTION_SYSTEM_INTERVAL_FAILURE = 0x861,
-  RRC_CONNECTION_REJECT_BY_NETWORK = 0x862,
-  RRC_CONNECTION_NORMAL_RELEASE = 0x863,
-  RRC_CONNECTION_RADIO_LINK_FAILURE = 0x864,
-  RRC_CONNECTION_REESTABLISHMENT_FAILURE = 0x865,
-  RRC_CONNECTION_OUT_OF_SERVICE_DURING_CELL_REGISTER = 0x866,
-  RRC_CONNECTION_ABORT_REQUEST = 0x867,
-  RRC_CONNECTION_SYSTEM_INFORMATION_BLOCK_READ_ERROR = 0x868,
-  NETWORK_INITIATED_DETACH_WITH_AUTO_REATTACH = 0x869,
-  NETWORK_INITIATED_DETACH_NO_AUTO_REATTACH = 0x86A,
-  ESM_PROCEDURE_TIME_OUT = 0x86B,
-  INVALID_CONNECTION_ID = 0x86C,
-  MAXIMIUM_NSAPIS_EXCEEDED = 0x86D,
-  INVALID_PRIMARY_NSAPI = 0x86E,
-  CANNOT_ENCODE_OTA_MESSAGE = 0x86F,
-  RADIO_ACCESS_BEARER_SETUP_FAILURE = 0x870,
-  PDP_ESTABLISH_TIMEOUT_EXPIRED = 0x871,
-  PDP_MODIFY_TIMEOUT_EXPIRED = 0x872,
-  PDP_INACTIVE_TIMEOUT_EXPIRED = 0x873,
-  PDP_LOWERLAYER_ERROR = 0x874,
-  PDP_MODIFY_COLLISION = 0x875,
-  /**
-   * @deprecated use MAXIMUM_SIZE_OF_L2_MESSAGE_EXCEEDED instead.
-   */
-  MAXINUM_SIZE_OF_L2_MESSAGE_EXCEEDED = 0x876,
-  MAXIMUM_SIZE_OF_L2_MESSAGE_EXCEEDED = 0x876,
-  NAS_REQUEST_REJECTED_BY_NETWORK = 0x877,
-  RRC_CONNECTION_INVALID_REQUEST = 0x878,
-  RRC_CONNECTION_TRACKING_AREA_ID_CHANGED = 0x879,
-  RRC_CONNECTION_RF_UNAVAILABLE = 0x87A,
-  RRC_CONNECTION_ABORTED_DUE_TO_IRAT_CHANGE = 0x87B,
-  RRC_CONNECTION_RELEASED_SECURITY_NOT_ACTIVE = 0x87C,
-  RRC_CONNECTION_ABORTED_AFTER_HANDOVER = 0x87D,
-  RRC_CONNECTION_ABORTED_AFTER_IRAT_CELL_CHANGE = 0x87E,
-  RRC_CONNECTION_ABORTED_DURING_IRAT_CELL_CHANGE = 0x87F,
-  IMSI_UNKNOWN_IN_HOME_SUBSCRIBER_SERVER = 0x880,
-  IMEI_NOT_ACCEPTED = 0x881,
-  EPS_SERVICES_AND_NON_EPS_SERVICES_NOT_ALLOWED = 0x882,
-  EPS_SERVICES_NOT_ALLOWED_IN_PLMN = 0x883,
-  MSC_TEMPORARILY_NOT_REACHABLE = 0x884,
-  CS_DOMAIN_NOT_AVAILABLE = 0x885,
-  ESM_FAILURE = 0x886,
-  MAC_FAILURE = 0x887,
-  SYNCHRONIZATION_FAILURE = 0x888,
-  UE_SECURITY_CAPABILITIES_MISMATCH = 0x889,
-  SECURITY_MODE_REJECTED = 0x88A,
-  UNACCEPTABLE_NON_EPS_AUTHENTICATION = 0x88B,
-  CS_FALLBACK_CALL_ESTABLISHMENT_NOT_ALLOWED = 0x88C,
-  NO_EPS_BEARER_CONTEXT_ACTIVATED = 0x88D,
-  INVALID_EMM_STATE = 0x88E,
-  NAS_LAYER_FAILURE = 0x88F,
-  MULTIPLE_PDP_CALL_NOT_ALLOWED = 0x890,
-  EMBMS_NOT_ENABLED = 0x891,
-  IRAT_HANDOVER_FAILED = 0x892,
-  EMBMS_REGULAR_DEACTIVATION = 0x893,
-  TEST_LOOPBACK_REGULAR_DEACTIVATION = 0x894,
-  LOWER_LAYER_REGISTRATION_FAILURE = 0x895,
-  DATA_PLAN_EXPIRED = 0x896,
-  UMTS_HANDOVER_TO_IWLAN = 0x897,
-  EVDO_CONNECTION_DENY_BY_GENERAL_OR_NETWORK_BUSY = 0x898,
-  EVDO_CONNECTION_DENY_BY_BILLING_OR_AUTHENTICATION_FAILURE = 0x899,
-  EVDO_HDR_CHANGED = 0x89A,
-  EVDO_HDR_EXITED = 0x89B,
-  EVDO_HDR_NO_SESSION = 0x89C,
-  EVDO_USING_GPS_FIX_INSTEAD_OF_HDR_CALL = 0x89D,
-  EVDO_HDR_CONNECTION_SETUP_TIMEOUT = 0x89E,
-  FAILED_TO_ACQUIRE_COLOCATED_HDR = 0x89F,
-  OTASP_COMMIT_IN_PROGRESS = 0x8A0,
-  NO_HYBRID_HDR_SERVICE = 0x8A1,
-  HDR_NO_LOCK_GRANTED = 0x8A2,
-  DBM_OR_SMS_IN_PROGRESS = 0x8A3,
-  HDR_FADE = 0x8A4,
-  HDR_ACCESS_FAILURE = 0x8A5,
-  UNSUPPORTED_1X_PREV = 0x8A6,
-  LOCAL_END = 0x8A7,
-  NO_SERVICE = 0x8A8,
-  FADE = 0x8A9,
-  NORMAL_RELEASE = 0x8AA,
-  ACCESS_ATTEMPT_ALREADY_IN_PROGRESS = 0x8AB,
-  REDIRECTION_OR_HANDOFF_IN_PROGRESS = 0x8AC,
-  EMERGENCY_MODE = 0x8AD,
-  PHONE_IN_USE = 0x8AE,
-  INVALID_MODE = 0x8AF,
-  INVALID_SIM_STATE = 0x8B0,
-  NO_COLLOCATED_HDR = 0x8B1,
-  UE_IS_ENTERING_POWERSAVE_MODE = 0x8B2,
-  DUAL_SWITCH = 0x8B3,
-  PPP_TIMEOUT = 0x8B4,
-  PPP_AUTH_FAILURE = 0x8B5,
-  PPP_OPTION_MISMATCH = 0x8B6,
-  PPP_PAP_FAILURE = 0x8B7,
-  PPP_CHAP_FAILURE = 0x8B8,
-  PPP_CLOSE_IN_PROGRESS = 0x8B9,
-  LIMITED_TO_IPV4 = 0x8BA,
-  LIMITED_TO_IPV6 = 0x8BB,
-  VSNCP_TIMEOUT = 0x8BC,
-  VSNCP_GEN_ERROR = 0x8BD,
-  VSNCP_APN_UNAUTHORIZED = 0x8BE,
-  VSNCP_PDN_LIMIT_EXCEEDED = 0x8BF,
-  VSNCP_NO_PDN_GATEWAY_ADDRESS = 0x8C0,
-  VSNCP_PDN_GATEWAY_UNREACHABLE = 0x8C1,
-  VSNCP_PDN_GATEWAY_REJECT = 0x8C2,
-  VSNCP_INSUFFICIENT_PARAMETERS = 0x8C3,
-  VSNCP_RESOURCE_UNAVAILABLE = 0x8C4,
-  VSNCP_ADMINISTRATIVELY_PROHIBITED = 0x8C5,
-  VSNCP_PDN_ID_IN_USE = 0x8C6,
-  VSNCP_SUBSCRIBER_LIMITATION = 0x8C7,
-  VSNCP_PDN_EXISTS_FOR_THIS_APN = 0x8C8,
-  VSNCP_RECONNECT_NOT_ALLOWED = 0x8C9,
-  IPV6_PREFIX_UNAVAILABLE = 0x8CA,
-  HANDOFF_PREFERENCE_CHANGED = 0x8CB,
-  SLICE_REJECTED = 0x8CC,
-  MATCH_ALL_RULE_NOT_ALLOWED = 0x8CD,
-  ALL_MATCHING_RULES_FAILED = 0x8CE,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/DataProfileInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/DataProfileInfo.aidl
deleted file mode 100644
index d68a9d7..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/DataProfileInfo.aidl
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable DataProfileInfo {
-  int profileId;
-  String apn;
-  android.hardware.radio.data.PdpProtocolType protocol = android.hardware.radio.data.PdpProtocolType.IP;
-  android.hardware.radio.data.PdpProtocolType roamingProtocol = android.hardware.radio.data.PdpProtocolType.IP;
-  android.hardware.radio.data.ApnAuthType authType = android.hardware.radio.data.ApnAuthType.NO_PAP_NO_CHAP;
-  String user;
-  String password;
-  int type;
-  int maxConnsTime;
-  int maxConns;
-  int waitTime;
-  boolean enabled;
-  int supportedApnTypesBitmap;
-  int bearerBitmap;
-  int mtuV4;
-  int mtuV6;
-  boolean preferred;
-  boolean persistent;
-  boolean alwaysOn;
-  android.hardware.radio.data.TrafficDescriptor trafficDescriptor;
-  int infrastructureBitmap = INFRASTRUCTURE_UNKNOWN /* 0 */;
-  const int ID_DEFAULT = 0;
-  const int ID_TETHERED = 1;
-  const int ID_IMS = 2;
-  const int ID_FOTA = 3;
-  const int ID_CBS = 4;
-  const int ID_OEM_BASE = 1000;
-  const int ID_INVALID = 0xFFFFFFFF;
-  const int TYPE_COMMON = 0;
-  const int TYPE_3GPP = 1;
-  const int TYPE_3GPP2 = 2;
-  const int INFRASTRUCTURE_UNKNOWN = 0;
-  const int INFRASTRUCTURE_CELLULAR = (1 << 0) /* 1 */;
-  const int INFRASTRUCTURE_SATELLITE = (1 << 1) /* 2 */;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/DataRequestReason.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/DataRequestReason.aidl
deleted file mode 100644
index 98ae53a..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/DataRequestReason.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum DataRequestReason {
-  NORMAL = 1,
-  SHUTDOWN = 2,
-  HANDOVER = 3,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/DataThrottlingAction.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/DataThrottlingAction.aidl
deleted file mode 100644
index f5fae50..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/DataThrottlingAction.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@Backing(type="byte") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-enum DataThrottlingAction {
-  NO_DATA_THROTTLING,
-  THROTTLE_SECONDARY_CARRIER,
-  THROTTLE_ANCHOR_CARRIER,
-  HOLD,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/EpsQos.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/EpsQos.aidl
deleted file mode 100644
index 3a3f41d..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/EpsQos.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable EpsQos {
-  int qci;
-  android.hardware.radio.data.QosBandwidth downlink;
-  android.hardware.radio.data.QosBandwidth uplink;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/IRadioData.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/IRadioData.aidl
deleted file mode 100644
index 3888c62..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/IRadioData.aidl
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@VintfStability
-interface IRadioData {
-  oneway void allocatePduSessionId(in int serial);
-  oneway void cancelHandover(in int serial, in int callId);
-  oneway void deactivateDataCall(in int serial, in int cid, in android.hardware.radio.data.DataRequestReason reason);
-  oneway void getDataCallList(in int serial);
-  oneway void getSlicingConfig(in int serial);
-  oneway void releasePduSessionId(in int serial, in int id);
-  oneway void responseAcknowledgement();
-  oneway void setDataAllowed(in int serial, in boolean allow);
-  oneway void setDataProfile(in int serial, in android.hardware.radio.data.DataProfileInfo[] profiles);
-  oneway void setDataThrottling(in int serial, in android.hardware.radio.data.DataThrottlingAction dataThrottlingAction, in long completionDurationMillis);
-  oneway void setInitialAttachApn(in int serial, in @nullable android.hardware.radio.data.DataProfileInfo dataProfileInfo);
-  oneway void setResponseFunctions(in android.hardware.radio.data.IRadioDataResponse radioDataResponse, in android.hardware.radio.data.IRadioDataIndication radioDataIndication);
-  oneway void setupDataCall(in int serial, in android.hardware.radio.AccessNetwork accessNetwork, in android.hardware.radio.data.DataProfileInfo dataProfileInfo, in boolean roamingAllowed, in android.hardware.radio.data.DataRequestReason reason, in android.hardware.radio.data.LinkAddress[] addresses, in String[] dnses, in int pduSessionId, in @nullable android.hardware.radio.data.SliceInfo sliceInfo, in boolean matchAllRuleAllowed);
-  oneway void startHandover(in int serial, in int callId);
-  oneway void startKeepalive(in int serial, in android.hardware.radio.data.KeepaliveRequest keepalive);
-  oneway void stopKeepalive(in int serial, in int sessionHandle);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/IRadioDataIndication.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/IRadioDataIndication.aidl
deleted file mode 100644
index 6057d6a..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/IRadioDataIndication.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@VintfStability
-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);
-  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);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/IRadioDataResponse.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/IRadioDataResponse.aidl
deleted file mode 100644
index dc44454..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/IRadioDataResponse.aidl
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@VintfStability
-interface IRadioDataResponse {
-  oneway void acknowledgeRequest(in int serial);
-  oneway void allocatePduSessionIdResponse(in android.hardware.radio.RadioResponseInfo info, in int id);
-  oneway void cancelHandoverResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void deactivateDataCallResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void getDataCallListResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.data.SetupDataCallResult[] dcResponse);
-  oneway void getSlicingConfigResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.data.SlicingConfig slicingConfig);
-  oneway void releasePduSessionIdResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setDataAllowedResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setDataProfileResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setDataThrottlingResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setInitialAttachApnResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setupDataCallResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.data.SetupDataCallResult dcResponse);
-  oneway void startHandoverResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void startKeepaliveResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.data.KeepaliveStatus status);
-  oneway void stopKeepaliveResponse(in android.hardware.radio.RadioResponseInfo info);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/KeepaliveRequest.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/KeepaliveRequest.aidl
deleted file mode 100644
index 789ee86..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/KeepaliveRequest.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable KeepaliveRequest {
-  int type;
-  byte[] sourceAddress;
-  int sourcePort;
-  byte[] destinationAddress;
-  int destinationPort;
-  int maxKeepaliveIntervalMillis;
-  int cid;
-  const int TYPE_NATT_IPV4 = 0;
-  const int TYPE_NATT_IPV6 = 1;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/KeepaliveStatus.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/KeepaliveStatus.aidl
deleted file mode 100644
index 404b44a..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/KeepaliveStatus.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable KeepaliveStatus {
-  int sessionHandle;
-  int code;
-  const int CODE_ACTIVE = 0;
-  const int CODE_INACTIVE = 1;
-  const int CODE_PENDING = 2;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/LinkAddress.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/LinkAddress.aidl
deleted file mode 100644
index 67d679f..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/LinkAddress.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-parcelable LinkAddress {
-  String address;
-  int addressProperties;
-  long deprecationTime;
-  long expirationTime;
-  const int ADDRESS_PROPERTY_NONE = 0;
-  const int ADDRESS_PROPERTY_DEPRECATED = 0x20;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/NrQos.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/NrQos.aidl
deleted file mode 100644
index 22bbe42..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/NrQos.aidl
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable NrQos {
-  int fiveQi;
-  android.hardware.radio.data.QosBandwidth downlink;
-  android.hardware.radio.data.QosBandwidth uplink;
-  byte qfi;
-  /**
-   * @deprecated use averagingWindowMillis;
-   */
-  char averagingWindowMs;
-  int averagingWindowMillis = AVERAGING_WINDOW_UNKNOWN /* -1 */;
-  const byte FLOW_ID_RANGE_MIN = 1;
-  const byte FLOW_ID_RANGE_MAX = 63;
-  const int AVERAGING_WINDOW_UNKNOWN = (-1) /* -1 */;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/OsAppId.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/OsAppId.aidl
deleted file mode 100644
index e4bbf79..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/OsAppId.aidl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable OsAppId {
-  byte[] osAppId;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/PcoDataInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/PcoDataInfo.aidl
deleted file mode 100644
index ea7529c..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/PcoDataInfo.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable PcoDataInfo {
-  int cid;
-  String bearerProto;
-  int pcoId;
-  byte[] contents;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/PdpProtocolType.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/PdpProtocolType.aidl
deleted file mode 100644
index 3a7f82d..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/PdpProtocolType.aidl
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum PdpProtocolType {
-  UNKNOWN = (-1) /* -1 */,
-  IP = 0,
-  IPV6 = 1,
-  IPV4V6 = 2,
-  PPP = 3,
-  NON_IP = 4,
-  UNSTRUCTURED = 5,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/PortRange.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/PortRange.aidl
deleted file mode 100644
index e428f1a..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/PortRange.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-parcelable PortRange {
-  int start;
-  int end;
-  const int PORT_RANGE_MIN = 20;
-  const int PORT_RANGE_MAX = 65535;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/Qos.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/Qos.aidl
deleted file mode 100644
index 4dac56c..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/Qos.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-union Qos {
-  boolean noinit;
-  android.hardware.radio.data.EpsQos eps;
-  android.hardware.radio.data.NrQos nr;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/QosBandwidth.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/QosBandwidth.aidl
deleted file mode 100644
index b59dee0..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/QosBandwidth.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable QosBandwidth {
-  int maxBitrateKbps;
-  int guaranteedBitrateKbps;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/QosFilter.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/QosFilter.aidl
deleted file mode 100644
index a3208d9..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/QosFilter.aidl
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable QosFilter {
-  String[] localAddresses;
-  String[] remoteAddresses;
-  @nullable android.hardware.radio.data.PortRange localPort;
-  @nullable android.hardware.radio.data.PortRange remotePort;
-  byte protocol;
-  android.hardware.radio.data.QosFilterTypeOfService tos;
-  android.hardware.radio.data.QosFilterIpv6FlowLabel flowLabel;
-  android.hardware.radio.data.QosFilterIpsecSpi spi;
-  byte direction;
-  int precedence;
-  const byte DIRECTION_DOWNLINK = 0;
-  const byte DIRECTION_UPLINK = 1;
-  const byte DIRECTION_BIDIRECTIONAL = 2;
-  const byte PROTOCOL_UNSPECIFIED = (-1) /* -1 */;
-  const byte PROTOCOL_TCP = 6;
-  const byte PROTOCOL_UDP = 17;
-  const byte PROTOCOL_ESP = 50;
-  const byte PROTOCOL_AH = 51;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/QosFilterIpsecSpi.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/QosFilterIpsecSpi.aidl
deleted file mode 100644
index 50b52a4..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/QosFilterIpsecSpi.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-union QosFilterIpsecSpi {
-  boolean noinit;
-  int value;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/QosFilterIpv6FlowLabel.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/QosFilterIpv6FlowLabel.aidl
deleted file mode 100644
index 4913dcf..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/QosFilterIpv6FlowLabel.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-union QosFilterIpv6FlowLabel {
-  boolean noinit;
-  int value;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/QosFilterTypeOfService.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/QosFilterTypeOfService.aidl
deleted file mode 100644
index 4f0d260..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/QosFilterTypeOfService.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-union QosFilterTypeOfService {
-  boolean noinit;
-  byte value;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/QosSession.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/QosSession.aidl
deleted file mode 100644
index 89010a9..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/QosSession.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable QosSession {
-  int qosSessionId;
-  android.hardware.radio.data.Qos qos;
-  android.hardware.radio.data.QosFilter[] qosFilters;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/RouteSelectionDescriptor.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/RouteSelectionDescriptor.aidl
deleted file mode 100644
index 80c055e..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/RouteSelectionDescriptor.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable RouteSelectionDescriptor {
-  byte precedence;
-  android.hardware.radio.data.PdpProtocolType sessionType = android.hardware.radio.data.PdpProtocolType.IP;
-  byte sscMode;
-  android.hardware.radio.data.SliceInfo[] sliceInfo;
-  String[] dnn;
-  const byte SSC_MODE_UNKNOWN = (-1) /* -1 */;
-  const byte SSC_MODE_1 = 1;
-  const byte SSC_MODE_2 = 2;
-  const byte SSC_MODE_3 = 3;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/SetupDataCallResult.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/SetupDataCallResult.aidl
deleted file mode 100644
index 699cc4d..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/SetupDataCallResult.aidl
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-parcelable SetupDataCallResult {
-  android.hardware.radio.data.DataCallFailCause cause = android.hardware.radio.data.DataCallFailCause.NONE;
-  long suggestedRetryTime;
-  int cid;
-  int active;
-  android.hardware.radio.data.PdpProtocolType type = android.hardware.radio.data.PdpProtocolType.IP;
-  String ifname;
-  android.hardware.radio.data.LinkAddress[] addresses;
-  String[] dnses;
-  String[] gateways;
-  String[] pcscf;
-  int mtuV4;
-  int mtuV6;
-  android.hardware.radio.data.Qos defaultQos;
-  android.hardware.radio.data.QosSession[] qosSessions;
-  byte handoverFailureMode;
-  int pduSessionId;
-  @nullable android.hardware.radio.data.SliceInfo sliceInfo;
-  android.hardware.radio.data.TrafficDescriptor[] trafficDescriptors;
-  const int DATA_CONNECTION_STATUS_INACTIVE = 0;
-  const int DATA_CONNECTION_STATUS_DORMANT = 1;
-  const int DATA_CONNECTION_STATUS_ACTIVE = 2;
-  const byte HANDOVER_FAILURE_MODE_LEGACY = 0;
-  const byte HANDOVER_FAILURE_MODE_DO_FALLBACK = 1;
-  const byte HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_HANDOVER = 2;
-  const byte HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_SETUP_NORMAL = 3;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/SliceInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/SliceInfo.aidl
deleted file mode 100644
index 60df402..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/SliceInfo.aidl
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable SliceInfo {
-  byte sliceServiceType;
-  int sliceDifferentiator;
-  byte mappedHplmnSst;
-  int mappedHplmnSd;
-  byte status;
-  const byte SERVICE_TYPE_NONE = 0;
-  const byte SERVICE_TYPE_EMBB = 1;
-  const byte SERVICE_TYPE_URLLC = 2;
-  const byte SERVICE_TYPE_MIOT = 3;
-  const byte STATUS_UNKNOWN = 0;
-  const byte STATUS_CONFIGURED = 1;
-  const byte STATUS_ALLOWED = 2;
-  const byte STATUS_REJECTED_NOT_AVAILABLE_IN_PLMN = 3;
-  const byte STATUS_REJECTED_NOT_AVAILABLE_IN_REG_AREA = 4;
-  const byte STATUS_DEFAULT_CONFIGURED = 5;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/SlicingConfig.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/SlicingConfig.aidl
deleted file mode 100644
index 4d28737..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/SlicingConfig.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable SlicingConfig {
-  android.hardware.radio.data.UrspRule[] urspRules;
-  android.hardware.radio.data.SliceInfo[] sliceInfo;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/TrafficDescriptor.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/TrafficDescriptor.aidl
deleted file mode 100644
index dc474a2..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/TrafficDescriptor.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable TrafficDescriptor {
-  @nullable String dnn;
-  @nullable android.hardware.radio.data.OsAppId osAppId;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/UrspRule.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/UrspRule.aidl
deleted file mode 100644
index 6850f6a..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.data/4/android/hardware/radio/data/UrspRule.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.data;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable UrspRule {
-  int precedence;
-  android.hardware.radio.data.TrafficDescriptor[] trafficDescriptors;
-  android.hardware.radio.data.RouteSelectionDescriptor[] routeSelectionDescriptor;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/.hash b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/.hash
deleted file mode 100644
index 17178bc..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/.hash
+++ /dev/null
@@ -1 +0,0 @@
-9637fe38a855ed3874bfff3811deea06c5270c93
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/AmrMode.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/AmrMode.aidl
deleted file mode 100644
index 3b38e19..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/AmrMode.aidl
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-enum AmrMode {
-  INVALID = 0,
-  AMR_MODE_0 = (1 << 0) /* 1 */,
-  AMR_MODE_1 = (1 << 1) /* 2 */,
-  AMR_MODE_2 = (1 << 2) /* 4 */,
-  AMR_MODE_3 = (1 << 3) /* 8 */,
-  AMR_MODE_4 = (1 << 4) /* 16 */,
-  AMR_MODE_5 = (1 << 5) /* 32 */,
-  AMR_MODE_6 = (1 << 6) /* 64 */,
-  AMR_MODE_7 = (1 << 7) /* 128 */,
-  AMR_MODE_8 = (1 << 8) /* 256 */,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/AmrParams.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/AmrParams.aidl
deleted file mode 100644
index eb65eb1..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/AmrParams.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable AmrParams {
-  android.hardware.radio.ims.media.AmrMode amrMode = android.hardware.radio.ims.media.AmrMode.INVALID;
-  boolean octetAligned;
-  int maxRedundancyMillis;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/AnbrMode.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/AnbrMode.aidl
deleted file mode 100644
index eca7b93..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/AnbrMode.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable AnbrMode {
-  android.hardware.radio.ims.media.CodecMode anbrUplinkMode;
-  android.hardware.radio.ims.media.CodecMode anbrDownlinkMode;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/CallQuality.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/CallQuality.aidl
deleted file mode 100644
index 594a39f..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/CallQuality.aidl
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CallQuality {
-  int downlinkCallQualityLevel;
-  int uplinkCallQualityLevel;
-  int callDuration;
-  int numRtpPacketsTransmitted;
-  int numRtpPacketsReceived;
-  int numRtpPacketsTransmittedLost;
-  int numRtpPacketsNotReceived;
-  int averageRelativeJitter;
-  int maxRelativeJitter;
-  int averageRoundTripTime;
-  int codecType;
-  boolean rtpInactivityDetected;
-  boolean rxSilenceDetected;
-  boolean txSilenceDetected;
-  int numVoiceFrames;
-  int numNoDataFrames;
-  int numDroppedRtpPackets;
-  long minPlayoutDelayMillis;
-  long maxPlayoutDelayMillis;
-  int numRtpSidPacketsReceived;
-  int numRtpDuplicatePackets;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/CodecMode.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/CodecMode.aidl
deleted file mode 100644
index 644321c..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/CodecMode.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-union CodecMode {
-  boolean noinit;
-  android.hardware.radio.ims.media.AmrMode amr;
-  android.hardware.radio.ims.media.EvsMode evs;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/CodecParams.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/CodecParams.aidl
deleted file mode 100644
index 1c80f7a..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/CodecParams.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CodecParams {
-  android.hardware.radio.ims.media.CodecType codecType = android.hardware.radio.ims.media.CodecType.INVALID;
-  byte rxPayloadTypeNumber;
-  byte txPayloadTypeNumber;
-  byte samplingRateKHz;
-  boolean dtxEnabled;
-  android.hardware.radio.ims.media.CodecSpecificParams codecSpecificParams;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/CodecSpecificParams.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/CodecSpecificParams.aidl
deleted file mode 100644
index 7e5722f..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/CodecSpecificParams.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-union CodecSpecificParams {
-  android.hardware.radio.ims.media.AmrParams amr;
-  android.hardware.radio.ims.media.EvsParams evs;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/CodecType.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/CodecType.aidl
deleted file mode 100644
index e97a647..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/CodecType.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum CodecType {
-  INVALID = 0,
-  AMR = (1 << 0) /* 1 */,
-  AMR_WB = (1 << 1) /* 2 */,
-  EVS = (1 << 2) /* 4 */,
-  PCMA = (1 << 3) /* 8 */,
-  PCMU = (1 << 4) /* 16 */,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/DtmfParams.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/DtmfParams.aidl
deleted file mode 100644
index f420fa7..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/DtmfParams.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable DtmfParams {
-  byte rxPayloadTypeNumber;
-  byte txPayloadTypeNumber;
-  byte samplingRateKHz;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/EvsBandwidth.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/EvsBandwidth.aidl
deleted file mode 100644
index d8c77bd..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/EvsBandwidth.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum EvsBandwidth {
-  NONE = 0,
-  NARROW_BAND = (1 << 0) /* 1 */,
-  WIDE_BAND = (1 << 1) /* 2 */,
-  SUPER_WIDE_BAND = (1 << 2) /* 4 */,
-  FULL_BAND = (1 << 3) /* 8 */,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/EvsMode.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/EvsMode.aidl
deleted file mode 100644
index ae0e1f7..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/EvsMode.aidl
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-enum EvsMode {
-  INVALID = 0,
-  EVS_MODE_0 = (1 << 0) /* 1 */,
-  EVS_MODE_1 = (1 << 1) /* 2 */,
-  EVS_MODE_2 = (1 << 2) /* 4 */,
-  EVS_MODE_3 = (1 << 3) /* 8 */,
-  EVS_MODE_4 = (1 << 4) /* 16 */,
-  EVS_MODE_5 = (1 << 5) /* 32 */,
-  EVS_MODE_6 = (1 << 6) /* 64 */,
-  EVS_MODE_7 = (1 << 7) /* 128 */,
-  EVS_MODE_8 = (1 << 8) /* 256 */,
-  EVS_MODE_9 = (1 << 9) /* 512 */,
-  EVS_MODE_10 = (1 << 10) /* 1024 */,
-  EVS_MODE_11 = (1 << 11) /* 2048 */,
-  EVS_MODE_12 = (1 << 12) /* 4096 */,
-  EVS_MODE_13 = (1 << 13) /* 8192 */,
-  EVS_MODE_14 = (1 << 14) /* 16384 */,
-  EVS_MODE_15 = (1 << 15) /* 32768 */,
-  EVS_MODE_16 = (1 << 16) /* 65536 */,
-  EVS_MODE_17 = (1 << 17) /* 131072 */,
-  EVS_MODE_18 = (1 << 18) /* 262144 */,
-  EVS_MODE_19 = (1 << 19) /* 524288 */,
-  EVS_MODE_20 = (1 << 20) /* 1048576 */,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/EvsParams.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/EvsParams.aidl
deleted file mode 100644
index 90d2204..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/EvsParams.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable EvsParams {
-  android.hardware.radio.ims.media.EvsBandwidth bandwidth = android.hardware.radio.ims.media.EvsBandwidth.NONE;
-  android.hardware.radio.ims.media.EvsMode evsMode = android.hardware.radio.ims.media.EvsMode.INVALID;
-  byte channelAwareMode;
-  boolean useHeaderFullOnly;
-  boolean useEvsModeSwitch;
-  byte codecModeRequest;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/IImsMedia.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/IImsMedia.aidl
deleted file mode 100644
index 190d25b..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/IImsMedia.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@VintfStability
-interface IImsMedia {
-  oneway void setListener(in android.hardware.radio.ims.media.IImsMediaListener mediaListener);
-  oneway void openSession(int sessionId, in android.hardware.radio.ims.media.LocalEndPoint localEndPoint, in android.hardware.radio.ims.media.RtpConfig config);
-  oneway void closeSession(int sessionId);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/IImsMediaListener.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/IImsMediaListener.aidl
deleted file mode 100644
index 9b7a392..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/IImsMediaListener.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@VintfStability
-interface IImsMediaListener {
-  oneway void onOpenSessionSuccess(int sessionId, android.hardware.radio.ims.media.IImsMediaSession session);
-  oneway void onOpenSessionFailure(int sessionId, android.hardware.radio.ims.media.RtpError error);
-  oneway void onSessionClosed(int sessionId);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/IImsMediaSession.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/IImsMediaSession.aidl
deleted file mode 100644
index 2150fbe..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/IImsMediaSession.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@VintfStability
-interface IImsMediaSession {
-  oneway void setListener(in android.hardware.radio.ims.media.IImsMediaSessionListener sessionListener);
-  oneway void modifySession(in android.hardware.radio.ims.media.RtpConfig config);
-  oneway void sendDtmf(char dtmfDigit, int duration);
-  oneway void startDtmf(char dtmfDigit);
-  oneway void stopDtmf();
-  oneway void sendHeaderExtension(in List<android.hardware.radio.ims.media.RtpHeaderExtension> extensions);
-  oneway void setMediaQualityThreshold(in android.hardware.radio.ims.media.MediaQualityThreshold threshold);
-  oneway void requestRtpReceptionStats(in int intervalMs);
-  oneway void adjustDelay(in int delayMs);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/IImsMediaSessionListener.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/IImsMediaSessionListener.aidl
deleted file mode 100644
index 87474ef..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/IImsMediaSessionListener.aidl
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@VintfStability
-interface IImsMediaSessionListener {
-  oneway void onModifySessionResponse(in android.hardware.radio.ims.media.RtpConfig config, android.hardware.radio.ims.media.RtpError error);
-  oneway void onFirstMediaPacketReceived(in android.hardware.radio.ims.media.RtpConfig config);
-  oneway void onHeaderExtensionReceived(in List<android.hardware.radio.ims.media.RtpHeaderExtension> extensions);
-  oneway void notifyMediaQualityStatus(in android.hardware.radio.ims.media.MediaQualityStatus quality);
-  oneway void triggerAnbrQuery(in android.hardware.radio.ims.media.RtpConfig config);
-  oneway void onDtmfReceived(char dtmfDigit, int durationMs);
-  oneway void onCallQualityChanged(in android.hardware.radio.ims.media.CallQuality callQuality);
-  oneway void notifyRtpReceptionStats(in android.hardware.radio.ims.media.RtpReceptionStats stats);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/LocalEndPoint.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/LocalEndPoint.aidl
deleted file mode 100644
index 1095f01..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/LocalEndPoint.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable LocalEndPoint {
-  ParcelFileDescriptor rtpFd;
-  ParcelFileDescriptor rtcpFd;
-  int modemId;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/MediaDirection.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/MediaDirection.aidl
deleted file mode 100644
index 5410f2a..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/MediaDirection.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum MediaDirection {
-  NO_FLOW = 0,
-  RTP_TX = (1 << 0) /* 1 */,
-  RTP_RX = (1 << 1) /* 2 */,
-  RTCP_TX = (1 << 2) /* 4 */,
-  RTCP_RX = (1 << 3) /* 8 */,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/MediaQualityStatus.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/MediaQualityStatus.aidl
deleted file mode 100644
index da6e751..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/MediaQualityStatus.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable MediaQualityStatus {
-  int rtpInactivityTimeMillis;
-  int rtcpInactivityTimeMillis;
-  int rtpPacketLossRate;
-  int rtpJitterMillis;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/MediaQualityThreshold.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/MediaQualityThreshold.aidl
deleted file mode 100644
index ecc379c..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/MediaQualityThreshold.aidl
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable MediaQualityThreshold {
-  int[] rtpInactivityTimerMillis;
-  int rtcpInactivityTimerMillis;
-  int rtpPacketLossDurationMillis;
-  int rtpHysteresisTimeInMillis;
-  int[] rtpPacketLossRate;
-  int[] rtpJitterMillis;
-  boolean notifyCurrentStatus;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtcpConfig.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtcpConfig.aidl
deleted file mode 100644
index 0bc4154..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtcpConfig.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable RtcpConfig {
-  String canonicalName;
-  int transmitPort;
-  int transmitIntervalSec;
-  int rtcpXrBlocks;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtcpXrReportBlockType.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtcpXrReportBlockType.aidl
deleted file mode 100644
index b9cc15c..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtcpXrReportBlockType.aidl
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-enum RtcpXrReportBlockType {
-  RTCPXR_NONE = 0,
-  RTCPXR_LOSS_RLE_REPORT_BLOCK = (1 << 0) /* 1 */,
-  RTCPXR_DUPLICATE_RLE_REPORT_BLOCK = (1 << 1) /* 2 */,
-  RTCPXR_PACKET_RECEIPT_TIMES_REPORT_BLOCK = (1 << 2) /* 4 */,
-  RTCPXR_RECEIVER_REFERENCE_TIME_REPORT_BLOCK = (1 << 3) /* 8 */,
-  RTCPXR_DLRR_REPORT_BLOCK = (1 << 4) /* 16 */,
-  RTCPXR_STATISTICS_SUMMARY_REPORT_BLOCK = (1 << 5) /* 32 */,
-  RTCPXR_VOIP_METRICS_REPORT_BLOCK = (1 << 6) /* 64 */,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtpAddress.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtpAddress.aidl
deleted file mode 100644
index dd7f466..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtpAddress.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable RtpAddress {
-  String ipAddress;
-  int portNumber;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtpConfig.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtpConfig.aidl
deleted file mode 100644
index 6af5523..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtpConfig.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable RtpConfig {
-  int direction;
-  android.hardware.radio.AccessNetwork accessNetwork = android.hardware.radio.AccessNetwork.UNKNOWN;
-  android.hardware.radio.ims.media.RtpAddress remoteAddress;
-  android.hardware.radio.ims.media.RtpSessionParams sessionParams;
-  android.hardware.radio.ims.media.RtcpConfig rtcpConfig;
-  android.hardware.radio.ims.media.AnbrMode anbrModeParams;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtpError.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtpError.aidl
deleted file mode 100644
index 97dacf1..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtpError.aidl
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum RtpError {
-  NONE = 0,
-  INVALID_PARAM = 1,
-  NOT_READY = 2,
-  NO_MEMORY = 3,
-  NO_RESOURCES = 4,
-  PORT_UNAVAILABLE = 5,
-  NOT_SUPPORTED = 6,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtpHeaderExtension.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtpHeaderExtension.aidl
deleted file mode 100644
index 06207ee..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtpHeaderExtension.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable RtpHeaderExtension {
-  int localId;
-  byte[] data;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtpReceptionStats.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtpReceptionStats.aidl
deleted file mode 100644
index 216da4c..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtpReceptionStats.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-@VintfStability
-parcelable RtpReceptionStats {
-  int rtpTimestamp;
-  int rtcpSrTimestamp;
-  long rtcpSrNtpTimestamp;
-  int jitterBufferMs;
-  int roundTripTimeMs;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtpSessionParams.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtpSessionParams.aidl
deleted file mode 100644
index 4107432..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/3/android/hardware/radio/ims/media/RtpSessionParams.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims.media;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable RtpSessionParams {
-  byte pTimeMillis;
-  int maxPtimeMillis;
-  byte dscp;
-  android.hardware.radio.ims.media.DtmfParams dtmfParams;
-  android.hardware.radio.ims.media.CodecParams codecParams;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims/3/.hash b/radio/aidl/aidl_api/android.hardware.radio.ims/3/.hash
deleted file mode 100644
index d45a27a..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims/3/.hash
+++ /dev/null
@@ -1 +0,0 @@
-b2a615a151c7114c4216b1987fd32d40c797d00a
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ConnectionFailureInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ConnectionFailureInfo.aidl
deleted file mode 100644
index ae3bbac..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ConnectionFailureInfo.aidl
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable ConnectionFailureInfo {
-  android.hardware.radio.ims.ConnectionFailureInfo.ConnectionFailureReason failureReason = android.hardware.radio.ims.ConnectionFailureInfo.ConnectionFailureReason.INVALID;
-  int causeCode;
-  int waitTimeMillis;
-  @Backing(type="int") @SuppressWarnings(value={"redundant-name"}) @VintfStability
-  enum ConnectionFailureReason {
-    INVALID = 0,
-    REASON_ACCESS_DENIED = 1,
-    REASON_NAS_FAILURE = 2,
-    REASON_RACH_FAILURE = 3,
-    REASON_RLC_FAILURE = 4,
-    REASON_RRC_REJECT = 5,
-    REASON_RRC_TIMEOUT = 6,
-    REASON_NO_SERVICE = 7,
-    REASON_PDN_NOT_AVAILABLE = 8,
-    REASON_RF_BUSY = 9,
-    REASON_UNSPECIFIED = 0xFFFF,
-  }
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/EpsFallbackReason.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/EpsFallbackReason.aidl
deleted file mode 100644
index 75099e7..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/EpsFallbackReason.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"),
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum EpsFallbackReason {
-  NO_NETWORK_TRIGGER = 1,
-  NO_NETWORK_RESPONSE = 2,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/IRadioIms.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/IRadioIms.aidl
deleted file mode 100644
index 6018a4b..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/IRadioIms.aidl
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims;
-/* @hide */
-@VintfStability
-interface IRadioIms {
-  oneway void setSrvccCallInfo(int serial, in android.hardware.radio.ims.SrvccCall[] srvccCalls);
-  oneway void updateImsRegistrationInfo(int serial, in android.hardware.radio.ims.ImsRegistration imsRegistration);
-  oneway void startImsTraffic(int serial, int token, android.hardware.radio.ims.ImsTrafficType imsTrafficType, android.hardware.radio.AccessNetwork accessNetworkType, android.hardware.radio.ims.ImsCall.Direction trafficDirection);
-  oneway void stopImsTraffic(int serial, int token);
-  oneway void triggerEpsFallback(int serial, in android.hardware.radio.ims.EpsFallbackReason reason);
-  oneway void setResponseFunctions(in android.hardware.radio.ims.IRadioImsResponse radioImsResponse, in android.hardware.radio.ims.IRadioImsIndication radioImsIndication);
-  oneway void sendAnbrQuery(int serial, android.hardware.radio.ims.ImsStreamType mediaType, android.hardware.radio.ims.ImsStreamDirection direction, int bitsPerSecond);
-  oneway void updateImsCallStatus(int serial, in android.hardware.radio.ims.ImsCall[] imsCalls);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/IRadioImsIndication.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/IRadioImsIndication.aidl
deleted file mode 100644
index c754af3..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/IRadioImsIndication.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims;
-/* @hide */
-@VintfStability
-interface IRadioImsIndication {
-  oneway void onConnectionSetupFailure(in android.hardware.radio.RadioIndicationType type, int token, in android.hardware.radio.ims.ConnectionFailureInfo info);
-  oneway void notifyAnbr(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.ims.ImsStreamType mediaType, in android.hardware.radio.ims.ImsStreamDirection direction, int bitsPerSecond);
-  oneway void triggerImsDeregistration(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.ims.ImsDeregistrationReason reason);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/IRadioImsResponse.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/IRadioImsResponse.aidl
deleted file mode 100644
index fbb1bfc..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/IRadioImsResponse.aidl
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims;
-/* @hide */
-@VintfStability
-interface IRadioImsResponse {
-  oneway void setSrvccCallInfoResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void updateImsRegistrationInfoResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void startImsTrafficResponse(in android.hardware.radio.RadioResponseInfo info, in @nullable android.hardware.radio.ims.ConnectionFailureInfo failureInfo);
-  oneway void stopImsTrafficResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void triggerEpsFallbackResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void sendAnbrQueryResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void updateImsCallStatusResponse(in android.hardware.radio.RadioResponseInfo info);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsCall.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsCall.aidl
deleted file mode 100644
index 73d987a..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsCall.aidl
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable ImsCall {
-  int index;
-  android.hardware.radio.ims.ImsCall.CallType callType = android.hardware.radio.ims.ImsCall.CallType.NORMAL;
-  android.hardware.radio.AccessNetwork accessNetwork = android.hardware.radio.AccessNetwork.UNKNOWN;
-  android.hardware.radio.ims.ImsCall.CallState callState = android.hardware.radio.ims.ImsCall.CallState.ACTIVE;
-  android.hardware.radio.ims.ImsCall.Direction direction = android.hardware.radio.ims.ImsCall.Direction.INCOMING;
-  boolean isHeldByRemote;
-  @Backing(type="int")
-  enum CallType {
-    NORMAL,
-    EMERGENCY,
-  }
-  @Backing(type="int")
-  enum CallState {
-    ACTIVE,
-    HOLDING,
-    DIALING,
-    ALERTING,
-    INCOMING,
-    WAITING,
-    DISCONNECTING,
-    DISCONNECTED,
-  }
-  @Backing(type="int")
-  enum Direction {
-    INCOMING,
-    OUTGOING,
-  }
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsDeregistrationReason.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsDeregistrationReason.aidl
deleted file mode 100644
index 62dc69b..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsDeregistrationReason.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-enum ImsDeregistrationReason {
-  REASON_SIM_REMOVED = 1,
-  REASON_SIM_REFRESH = 2,
-  REASON_ALLOWED_NETWORK_TYPES_CHANGED = 3,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsRegistration.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsRegistration.aidl
deleted file mode 100644
index 73cfd07..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsRegistration.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"),
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims;
-/* @hide */
-@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-parcelable ImsRegistration {
-  android.hardware.radio.ims.ImsRegistrationState regState = android.hardware.radio.ims.ImsRegistrationState.NOT_REGISTERED;
-  android.hardware.radio.AccessNetwork accessNetworkType = android.hardware.radio.AccessNetwork.UNKNOWN;
-  android.hardware.radio.ims.SuggestedAction suggestedAction = android.hardware.radio.ims.SuggestedAction.NONE;
-  int capabilities;
-  const int IMS_MMTEL_CAPABILITY_NONE = 0;
-  const int IMS_MMTEL_CAPABILITY_VOICE = (1 << 0) /* 1 */;
-  const int IMS_MMTEL_CAPABILITY_VIDEO = (1 << 1) /* 2 */;
-  const int IMS_MMTEL_CAPABILITY_SMS = (1 << 2) /* 4 */;
-  const int IMS_RCS_CAPABILITIES = (1 << 3) /* 8 */;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsRegistrationState.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsRegistrationState.aidl
deleted file mode 100644
index 01ae565..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsRegistrationState.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"),
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum ImsRegistrationState {
-  NOT_REGISTERED,
-  REGISTERED,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsStreamDirection.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsStreamDirection.aidl
deleted file mode 100644
index efc3551..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsStreamDirection.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum ImsStreamDirection {
-  UPLINK = 1,
-  DOWNLINK = 2,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsStreamType.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsStreamType.aidl
deleted file mode 100644
index 853f4b5..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsStreamType.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum ImsStreamType {
-  AUDIO = 1,
-  VIDEO = 2,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsTrafficType.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsTrafficType.aidl
deleted file mode 100644
index 4eeda9d..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/ImsTrafficType.aidl
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum ImsTrafficType {
-  EMERGENCY,
-  EMERGENCY_SMS,
-  VOICE,
-  VIDEO,
-  SMS,
-  REGISTRATION,
-  UT_XCAP,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/SrvccCall.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/SrvccCall.aidl
deleted file mode 100644
index a2e2ae5..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/SrvccCall.aidl
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable SrvccCall {
-  int index;
-  android.hardware.radio.ims.SrvccCall.CallType callType = android.hardware.radio.ims.SrvccCall.CallType.NORMAL;
-  int callState;
-  android.hardware.radio.ims.SrvccCall.CallSubState callSubstate = android.hardware.radio.ims.SrvccCall.CallSubState.NONE;
-  android.hardware.radio.ims.SrvccCall.ToneType ringbackToneType = android.hardware.radio.ims.SrvccCall.ToneType.NONE;
-  boolean isMpty;
-  boolean isMT;
-  String number;
-  int numPresentation;
-  String name;
-  int namePresentation;
-  @Backing(type="int") @VintfStability
-  enum CallType {
-    NORMAL,
-    EMERGENCY,
-  }
-  @Backing(type="int") @VintfStability
-  enum CallSubState {
-    NONE,
-    PREALERTING,
-  }
-  @Backing(type="int") @VintfStability
-  enum ToneType {
-    NONE,
-    LOCAL,
-    NETWORK,
-  }
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/SuggestedAction.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/SuggestedAction.aidl
deleted file mode 100644
index 9846006..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.ims/3/android/hardware/radio/ims/SuggestedAction.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"),
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.ims;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum SuggestedAction {
-  NONE,
-  TRIGGER_PLMN_BLOCK,
-  TRIGGER_PLMN_BLOCK_WITH_TIMEOUT,
-  TRIGGER_RAT_BLOCK,
-  TRIGGER_CLEAR_RAT_BLOCKS,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/.hash b/radio/aidl/aidl_api/android.hardware.radio.messaging/4/.hash
deleted file mode 100644
index 276fc3f..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/.hash
+++ /dev/null
@@ -1 +0,0 @@
-378f2b952ec1200bbd0484fce9a2dcde2c50ad3d
diff --git a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/CdmaBroadcastSmsConfigInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/CdmaBroadcastSmsConfigInfo.aidl
deleted file mode 100644
index abfb308..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/CdmaBroadcastSmsConfigInfo.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.messaging;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CdmaBroadcastSmsConfigInfo {
-  int serviceCategory;
-  int language;
-  boolean selected;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/CdmaSmsAck.aidl b/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/CdmaSmsAck.aidl
deleted file mode 100644
index ee8371c..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/CdmaSmsAck.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.messaging;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CdmaSmsAck {
-  boolean errorClass;
-  int smsCauseCode;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/CdmaSmsAddress.aidl b/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/CdmaSmsAddress.aidl
deleted file mode 100644
index 7382b1f..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/CdmaSmsAddress.aidl
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.messaging;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CdmaSmsAddress {
-  int digitMode;
-  boolean isNumberModeDataNetwork;
-  int numberType;
-  int numberPlan;
-  byte[] digits;
-  const int DIGIT_MODE_FOUR_BIT = 0;
-  const int DIGIT_MODE_EIGHT_BIT = 1;
-  const int NUMBER_PLAN_UNKNOWN = 0;
-  const int NUMBER_PLAN_TELEPHONY = 1;
-  const int NUMBER_PLAN_RESERVED_2 = 2;
-  const int NUMBER_PLAN_DATA = 3;
-  const int NUMBER_PLAN_TELEX = 4;
-  const int NUMBER_PLAN_RESERVED_5 = 5;
-  const int NUMBER_PLAN_RESERVED_6 = 6;
-  const int NUMBER_PLAN_RESERVED_7 = 7;
-  const int NUMBER_PLAN_RESERVED_8 = 8;
-  const int NUMBER_PLAN_PRIVATE = 9;
-  const int NUMBER_PLAN_RESERVED_10 = 10;
-  const int NUMBER_PLAN_RESERVED_11 = 11;
-  const int NUMBER_PLAN_RESERVED_12 = 12;
-  const int NUMBER_PLAN_RESERVED_13 = 13;
-  const int NUMBER_PLAN_RESERVED_14 = 14;
-  const int NUMBER_PLAN_RESERVED_15 = 15;
-  const int NUMBER_TYPE_UNKNOWN = 0;
-  const int NUMBER_TYPE_INTERNATIONAL_OR_DATA_IP = 1;
-  const int NUMBER_TYPE_NATIONAL_OR_INTERNET_MAIL = 2;
-  const int NUMBER_TYPE_NETWORK = 3;
-  const int NUMBER_TYPE_SUBSCRIBER = 4;
-  const int NUMBER_TYPE_ALPHANUMERIC = 5;
-  const int NUMBER_TYPE_ABBREVIATED = 6;
-  const int NUMBER_TYPE_RESERVED_7 = 7;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/CdmaSmsMessage.aidl b/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/CdmaSmsMessage.aidl
deleted file mode 100644
index 0e98f4b..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/CdmaSmsMessage.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.messaging;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CdmaSmsMessage {
-  int teleserviceId;
-  boolean isServicePresent;
-  int serviceCategory;
-  android.hardware.radio.messaging.CdmaSmsAddress address;
-  android.hardware.radio.messaging.CdmaSmsSubaddress subAddress;
-  byte[] bearerData;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/CdmaSmsSubaddress.aidl b/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/CdmaSmsSubaddress.aidl
deleted file mode 100644
index 9982395..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/CdmaSmsSubaddress.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.messaging;
-/* @hide */
-@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-parcelable CdmaSmsSubaddress {
-  int subaddressType;
-  boolean odd;
-  byte[] digits;
-  const int SUBADDRESS_TYPE_NSAP = 0;
-  const int SUBADDRESS_TYPE_USER_SPECIFIED = 1;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/CdmaSmsWriteArgs.aidl b/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/CdmaSmsWriteArgs.aidl
deleted file mode 100644
index d6292e7..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/CdmaSmsWriteArgs.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.messaging;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CdmaSmsWriteArgs {
-  int status;
-  android.hardware.radio.messaging.CdmaSmsMessage message;
-  const int STATUS_REC_UNREAD = 0;
-  const int STATUS_REC_READ = 1;
-  const int STATUS_STO_UNSENT = 2;
-  const int STATUS_STO_SENT = 3;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/GsmBroadcastSmsConfigInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/GsmBroadcastSmsConfigInfo.aidl
deleted file mode 100644
index 1ccba86..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/GsmBroadcastSmsConfigInfo.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.messaging;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable GsmBroadcastSmsConfigInfo {
-  int fromServiceId;
-  int toServiceId;
-  int fromCodeScheme;
-  int toCodeScheme;
-  boolean selected;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/GsmSmsMessage.aidl b/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/GsmSmsMessage.aidl
deleted file mode 100644
index bdd7d0c..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/GsmSmsMessage.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.messaging;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable GsmSmsMessage {
-  String smscPdu;
-  String pdu;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/IRadioMessaging.aidl b/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/IRadioMessaging.aidl
deleted file mode 100644
index bf5fde5..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/IRadioMessaging.aidl
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.messaging;
-/* @hide */
-@VintfStability
-interface IRadioMessaging {
-  oneway void acknowledgeIncomingGsmSmsWithPdu(in int serial, in boolean success, in String ackPdu);
-  oneway void acknowledgeLastIncomingCdmaSms(in int serial, in android.hardware.radio.messaging.CdmaSmsAck smsAck);
-  oneway void acknowledgeLastIncomingGsmSms(in int serial, in boolean success, in android.hardware.radio.messaging.SmsAcknowledgeFailCause cause);
-  oneway void deleteSmsOnRuim(in int serial, in int index);
-  oneway void deleteSmsOnSim(in int serial, in int index);
-  oneway void getCdmaBroadcastConfig(in int serial);
-  oneway void getGsmBroadcastConfig(in int serial);
-  oneway void getSmscAddress(in int serial);
-  oneway void reportSmsMemoryStatus(in int serial, in boolean available);
-  oneway void responseAcknowledgement();
-  oneway void sendCdmaSms(in int serial, in android.hardware.radio.messaging.CdmaSmsMessage sms);
-  oneway void sendCdmaSmsExpectMore(in int serial, in android.hardware.radio.messaging.CdmaSmsMessage sms);
-  oneway void sendImsSms(in int serial, in android.hardware.radio.messaging.ImsSmsMessage message);
-  oneway void sendSms(in int serial, in android.hardware.radio.messaging.GsmSmsMessage message);
-  oneway void sendSmsExpectMore(in int serial, in android.hardware.radio.messaging.GsmSmsMessage message);
-  oneway void setCdmaBroadcastActivation(in int serial, in boolean activate);
-  oneway void setCdmaBroadcastConfig(in int serial, in android.hardware.radio.messaging.CdmaBroadcastSmsConfigInfo[] configInfo);
-  oneway void setGsmBroadcastActivation(in int serial, in boolean activate);
-  oneway void setGsmBroadcastConfig(in int serial, in android.hardware.radio.messaging.GsmBroadcastSmsConfigInfo[] configInfo);
-  oneway void setResponseFunctions(in android.hardware.radio.messaging.IRadioMessagingResponse radioMessagingResponse, in android.hardware.radio.messaging.IRadioMessagingIndication radioMessagingIndication);
-  oneway void setSmscAddress(in int serial, in String smsc);
-  oneway void writeSmsToRuim(in int serial, in android.hardware.radio.messaging.CdmaSmsWriteArgs cdmaSms);
-  oneway void writeSmsToSim(in int serial, in android.hardware.radio.messaging.SmsWriteArgs smsWriteArgs);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/IRadioMessagingIndication.aidl b/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/IRadioMessagingIndication.aidl
deleted file mode 100644
index 389fb26..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/IRadioMessagingIndication.aidl
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.messaging;
-/* @hide */
-@VintfStability
-interface IRadioMessagingIndication {
-  oneway void cdmaNewSms(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.messaging.CdmaSmsMessage msg);
-  oneway void cdmaRuimSmsStorageFull(in android.hardware.radio.RadioIndicationType type);
-  oneway void newBroadcastSms(in android.hardware.radio.RadioIndicationType type, in byte[] data);
-  oneway void newSms(in android.hardware.radio.RadioIndicationType type, in byte[] pdu);
-  oneway void newSmsOnSim(in android.hardware.radio.RadioIndicationType type, in int recordNumber);
-  oneway void newSmsStatusReport(in android.hardware.radio.RadioIndicationType type, in byte[] pdu);
-  oneway void simSmsStorageFull(in android.hardware.radio.RadioIndicationType type);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/IRadioMessagingResponse.aidl b/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/IRadioMessagingResponse.aidl
deleted file mode 100644
index 9b10464..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/IRadioMessagingResponse.aidl
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.messaging;
-/* @hide */
-@VintfStability
-interface IRadioMessagingResponse {
-  oneway void acknowledgeIncomingGsmSmsWithPduResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void acknowledgeLastIncomingCdmaSmsResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void acknowledgeLastIncomingGsmSmsResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void acknowledgeRequest(in int serial);
-  oneway void deleteSmsOnRuimResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void deleteSmsOnSimResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void getCdmaBroadcastConfigResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.messaging.CdmaBroadcastSmsConfigInfo[] configs);
-  oneway void getGsmBroadcastConfigResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.messaging.GsmBroadcastSmsConfigInfo[] configs);
-  oneway void getSmscAddressResponse(in android.hardware.radio.RadioResponseInfo info, in String smsc);
-  oneway void reportSmsMemoryStatusResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void sendCdmaSmsExpectMoreResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.messaging.SendSmsResult sms);
-  oneway void sendCdmaSmsResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.messaging.SendSmsResult sms);
-  oneway void sendImsSmsResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.messaging.SendSmsResult sms);
-  oneway void sendSmsExpectMoreResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.messaging.SendSmsResult sms);
-  oneway void sendSmsResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.messaging.SendSmsResult sms);
-  oneway void setCdmaBroadcastActivationResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setCdmaBroadcastConfigResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setGsmBroadcastActivationResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setGsmBroadcastConfigResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setSmscAddressResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void writeSmsToRuimResponse(in android.hardware.radio.RadioResponseInfo info, in int index);
-  oneway void writeSmsToSimResponse(in android.hardware.radio.RadioResponseInfo info, in int index);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/ImsSmsMessage.aidl b/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/ImsSmsMessage.aidl
deleted file mode 100644
index ff4a111..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/ImsSmsMessage.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.messaging;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable ImsSmsMessage {
-  android.hardware.radio.RadioTechnologyFamily tech = android.hardware.radio.RadioTechnologyFamily.THREE_GPP;
-  boolean retry;
-  int messageRef;
-  android.hardware.radio.messaging.CdmaSmsMessage[] cdmaMessage;
-  android.hardware.radio.messaging.GsmSmsMessage[] gsmMessage;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/SendSmsResult.aidl b/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/SendSmsResult.aidl
deleted file mode 100644
index 3f1d120..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/SendSmsResult.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.messaging;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable SendSmsResult {
-  int messageRef;
-  String ackPDU;
-  int errorCode;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/SmsAcknowledgeFailCause.aidl b/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/SmsAcknowledgeFailCause.aidl
deleted file mode 100644
index 6aeda3e..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/SmsAcknowledgeFailCause.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.messaging;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum SmsAcknowledgeFailCause {
-  MEMORY_CAPACITY_EXCEEDED = 0xD3,
-  UNSPECIFIED_ERROR = 0XFF,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/SmsWriteArgs.aidl b/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/SmsWriteArgs.aidl
deleted file mode 100644
index a294b47..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.messaging/4/android/hardware/radio/messaging/SmsWriteArgs.aidl
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.messaging;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable SmsWriteArgs {
-  int status;
-  String pdu;
-  String smsc;
-  const int STATUS_REC_UNREAD = 0;
-  const int STATUS_REC_READ = 1;
-  const int STATUS_STO_UNSENT = 2;
-  const int STATUS_STO_SENT = 3;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/4/.hash b/radio/aidl/aidl_api/android.hardware.radio.modem/4/.hash
deleted file mode 100644
index 278656d..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/4/.hash
+++ /dev/null
@@ -1 +0,0 @@
-bc4ce6ef66dc3ab835abe70751ff24b2e5753b69
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/ActivityStatsInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/ActivityStatsInfo.aidl
deleted file mode 100644
index c834342..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/ActivityStatsInfo.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.modem;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable ActivityStatsInfo {
-  int sleepModeTimeMs;
-  int idleModeTimeMs;
-  android.hardware.radio.modem.ActivityStatsTechSpecificInfo[] techSpecificInfo;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/ActivityStatsTechSpecificInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/ActivityStatsTechSpecificInfo.aidl
deleted file mode 100644
index 080a877..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/ActivityStatsTechSpecificInfo.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.modem;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable ActivityStatsTechSpecificInfo {
-  android.hardware.radio.AccessNetwork rat = android.hardware.radio.AccessNetwork.UNKNOWN;
-  int frequencyRange;
-  int[] txmModetimeMs;
-  int rxModeTimeMs;
-  const int FREQUENCY_RANGE_UNKNOWN = 0;
-  const int FREQUENCY_RANGE_LOW = 1;
-  const int FREQUENCY_RANGE_MID = 2;
-  const int FREQUENCY_RANGE_HIGH = 3;
-  const int FREQUENCY_RANGE_MMWAVE = 4;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/DeviceStateType.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/DeviceStateType.aidl
deleted file mode 100644
index 023658c..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/DeviceStateType.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.modem;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-enum DeviceStateType {
-  POWER_SAVE_MODE,
-  CHARGING_STATE,
-  LOW_DATA_EXPECTED,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/HardwareConfig.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/HardwareConfig.aidl
deleted file mode 100644
index 2d814ef..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/HardwareConfig.aidl
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.modem;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable HardwareConfig {
-  int type;
-  String uuid;
-  int state;
-  android.hardware.radio.modem.HardwareConfigModem[] modem;
-  android.hardware.radio.modem.HardwareConfigSim[] sim;
-  const int STATE_ENABLED = 0;
-  const int STATE_STANDBY = 1;
-  const int STATE_DISABLED = 2;
-  const int TYPE_MODEM = 0;
-  const int TYPE_SIM = 1;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/HardwareConfigModem.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/HardwareConfigModem.aidl
deleted file mode 100644
index 7d5537f..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/HardwareConfigModem.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.modem;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable HardwareConfigModem {
-  int rilModel;
-  android.hardware.radio.RadioTechnology rat = android.hardware.radio.RadioTechnology.UNKNOWN;
-  int maxVoiceCalls;
-  int maxDataCalls;
-  int maxStandby;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/HardwareConfigSim.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/HardwareConfigSim.aidl
deleted file mode 100644
index 4c2e31b..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/HardwareConfigSim.aidl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.modem;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable HardwareConfigSim {
-  String modemUuid;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/IRadioModem.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/IRadioModem.aidl
deleted file mode 100644
index bd8ba47..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/IRadioModem.aidl
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.modem;
-/* @hide */
-@VintfStability
-interface IRadioModem {
-  oneway void enableModem(in int serial, in boolean on);
-  oneway void getBasebandVersion(in int serial);
-  /**
-   * @deprecated use getImei(int serial)
-   */
-  oneway void getDeviceIdentity(in int serial);
-  oneway void getHardwareConfig(in int serial);
-  oneway void getModemActivityInfo(in int serial);
-  oneway void getModemStackStatus(in int serial);
-  oneway void getRadioCapability(in int serial);
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  oneway void nvReadItem(in int serial, in android.hardware.radio.modem.NvItem itemId);
-  oneway void nvResetConfig(in int serial, in android.hardware.radio.modem.ResetNvType resetType);
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  oneway void nvWriteCdmaPrl(in int serial, in byte[] prl);
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  oneway void nvWriteItem(in int serial, in android.hardware.radio.modem.NvWriteItem item);
-  oneway void requestShutdown(in int serial);
-  oneway void responseAcknowledgement();
-  oneway void sendDeviceState(in int serial, in android.hardware.radio.modem.DeviceStateType deviceStateType, in boolean state);
-  oneway void setRadioCapability(in int serial, in android.hardware.radio.modem.RadioCapability rc);
-  oneway void setRadioPower(in int serial, in boolean powerOn, in boolean forEmergencyCall, in boolean preferredForEmergencyCall);
-  oneway void setResponseFunctions(in android.hardware.radio.modem.IRadioModemResponse radioModemResponse, in android.hardware.radio.modem.IRadioModemIndication radioModemIndication);
-  oneway void getImei(in int serial);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/IRadioModemIndication.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/IRadioModemIndication.aidl
deleted file mode 100644
index 3c06877..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/IRadioModemIndication.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.modem;
-/* @hide */
-@VintfStability
-interface IRadioModemIndication {
-  oneway void hardwareConfigChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.modem.HardwareConfig[] configs);
-  oneway void modemReset(in android.hardware.radio.RadioIndicationType type, in String reason);
-  oneway void radioCapabilityIndication(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.modem.RadioCapability rc);
-  oneway void radioStateChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.modem.RadioState radioState);
-  oneway void rilConnected(in android.hardware.radio.RadioIndicationType type);
-  oneway void onImeiMappingChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.modem.ImeiInfo imeiInfo);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/IRadioModemResponse.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/IRadioModemResponse.aidl
deleted file mode 100644
index b9ef51b..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/IRadioModemResponse.aidl
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.modem;
-/* @hide */
-@VintfStability
-interface IRadioModemResponse {
-  oneway void acknowledgeRequest(in int serial);
-  oneway void enableModemResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void getBasebandVersionResponse(in android.hardware.radio.RadioResponseInfo info, in String version);
-  /**
-   * @deprecated use getImeiResponse(RadioResponseInfo responseInfo, ImeiInfo imeiInfo)
-   */
-  oneway void getDeviceIdentityResponse(in android.hardware.radio.RadioResponseInfo info, in String imei, in String imeisv, in String esn, in String meid);
-  oneway void getHardwareConfigResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.modem.HardwareConfig[] config);
-  oneway void getModemActivityInfoResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.modem.ActivityStatsInfo activityInfo);
-  oneway void getModemStackStatusResponse(in android.hardware.radio.RadioResponseInfo info, in boolean isEnabled);
-  oneway void getRadioCapabilityResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.modem.RadioCapability rc);
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  oneway void nvReadItemResponse(in android.hardware.radio.RadioResponseInfo info, in String result);
-  oneway void nvResetConfigResponse(in android.hardware.radio.RadioResponseInfo info);
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  oneway void nvWriteCdmaPrlResponse(in android.hardware.radio.RadioResponseInfo info);
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  oneway void nvWriteItemResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void requestShutdownResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void sendDeviceStateResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setRadioCapabilityResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.modem.RadioCapability rc);
-  oneway void setRadioPowerResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void getImeiResponse(in android.hardware.radio.RadioResponseInfo responseInfo, in @nullable android.hardware.radio.modem.ImeiInfo imeiInfo);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/ImeiInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/ImeiInfo.aidl
deleted file mode 100644
index 96fb5a8..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/ImeiInfo.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.modem;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable ImeiInfo {
-  android.hardware.radio.modem.ImeiInfo.ImeiType type = android.hardware.radio.modem.ImeiInfo.ImeiType.INVALID;
-  String imei;
-  String svn;
-  @Backing(type="int") @VintfStability
-  enum ImeiType {
-    INVALID = 0,
-    PRIMARY = 1,
-    SECONDARY = 2,
-  }
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/NvItem.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/NvItem.aidl
deleted file mode 100644
index bafcd19..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/NvItem.aidl
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.modem;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum NvItem {
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  INVALID = 0,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  CDMA_MEID = 1,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  CDMA_MIN = 2,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  CDMA_MDN = 3,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  CDMA_ACCOLC = 4,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  DEVICE_MSL = 11,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  RTN_RECONDITIONED_STATUS = 12,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  RTN_ACTIVATION_DATE = 13,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  RTN_LIFE_TIMER = 14,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  RTN_LIFE_CALLS = 15,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  RTN_LIFE_DATA_TX = 16,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  RTN_LIFE_DATA_RX = 17,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  OMADM_HFA_LEVEL = 18,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  MIP_PROFILE_NAI = 31,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  MIP_PROFILE_HOME_ADDRESS = 32,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  MIP_PROFILE_AAA_AUTH = 33,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  MIP_PROFILE_HA_AUTH = 34,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  MIP_PROFILE_PRI_HA_ADDR = 35,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  MIP_PROFILE_SEC_HA_ADDR = 36,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  MIP_PROFILE_REV_TUN_PREF = 37,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  MIP_PROFILE_HA_SPI = 38,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  MIP_PROFILE_AAA_SPI = 39,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  MIP_PROFILE_MN_HA_SS = 40,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  MIP_PROFILE_MN_AAA_SS = 41,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  CDMA_PRL_VERSION = 51,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  CDMA_BC10 = 52,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  CDMA_BC14 = 53,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  CDMA_SO68 = 54,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  CDMA_SO73_COP0 = 55,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  CDMA_SO73_COP1TO7 = 56,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  CDMA_1X_ADVANCED_ENABLED = 57,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  CDMA_EHRPD_ENABLED = 58,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  CDMA_EHRPD_FORCED = 59,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  LTE_BAND_ENABLE_25 = 71,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  LTE_BAND_ENABLE_26 = 72,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  LTE_BAND_ENABLE_41 = 73,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  LTE_SCAN_PRIORITY_25 = 74,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  LTE_SCAN_PRIORITY_26 = 75,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  LTE_SCAN_PRIORITY_41 = 76,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  LTE_HIDDEN_BAND_PRIORITY_25 = 77,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  LTE_HIDDEN_BAND_PRIORITY_26 = 78,
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  LTE_HIDDEN_BAND_PRIORITY_41 = 79,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/NvWriteItem.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/NvWriteItem.aidl
deleted file mode 100644
index c941246..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/NvWriteItem.aidl
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.modem;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable NvWriteItem {
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  android.hardware.radio.modem.NvItem itemId = android.hardware.radio.modem.NvItem.INVALID;
-  /**
-   * @deprecated NV APIs are deprecated starting from Android U.
-   */
-  String value;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/RadioCapability.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/RadioCapability.aidl
deleted file mode 100644
index bc3cfcc..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/RadioCapability.aidl
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.modem;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable RadioCapability {
-  int session;
-  int phase;
-  int raf;
-  String logicalModemUuid;
-  int status;
-  const int PHASE_CONFIGURED = 0;
-  const int PHASE_START = 1;
-  const int PHASE_APPLY = 2;
-  const int PHASE_UNSOL_RSP = 3;
-  const int PHASE_FINISH = 4;
-  const int STATUS_NONE = 0;
-  const int STATUS_SUCCESS = 1;
-  const int STATUS_FAIL = 2;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/RadioState.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/RadioState.aidl
deleted file mode 100644
index 3383fa4..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/RadioState.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.modem;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum RadioState {
-  OFF = 0,
-  UNAVAILABLE = 1,
-  ON = 10,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/ResetNvType.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/ResetNvType.aidl
deleted file mode 100644
index e9937f0..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/4/android/hardware/radio/modem/ResetNvType.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.modem;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-enum ResetNvType {
-  RELOAD,
-  ERASE,
-  FACTORY_RESET,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/.hash b/radio/aidl/aidl_api/android.hardware.radio.network/4/.hash
deleted file mode 100644
index 1a6d76e..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/.hash
+++ /dev/null
@@ -1 +0,0 @@
-d734a247120a403b4bbecc74df156e8864926105
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/AccessTechnologySpecificInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/AccessTechnologySpecificInfo.aidl
deleted file mode 100644
index 667a8a7..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/AccessTechnologySpecificInfo.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-union AccessTechnologySpecificInfo {
-  boolean noinit;
-  android.hardware.radio.network.Cdma2000RegistrationInfo cdmaInfo;
-  android.hardware.radio.network.EutranRegistrationInfo eutranInfo;
-  android.hardware.radio.network.NrVopsInfo ngranNrVopsInfo;
-  boolean geranDtmSupported;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/BarringInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/BarringInfo.aidl
deleted file mode 100644
index 3c812c0..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/BarringInfo.aidl
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-parcelable BarringInfo {
-  int serviceType;
-  int barringType;
-  @nullable android.hardware.radio.network.BarringTypeSpecificInfo barringTypeSpecificInfo;
-  const int BARRING_TYPE_NONE = 0;
-  const int BARRING_TYPE_CONDITIONAL = 1;
-  const int BARRING_TYPE_UNCONDITIONAL = 2;
-  const int SERVICE_TYPE_CS_SERVICE = 0;
-  const int SERVICE_TYPE_PS_SERVICE = 1;
-  const int SERVICE_TYPE_CS_VOICE = 2;
-  const int SERVICE_TYPE_MO_SIGNALLING = 3;
-  const int SERVICE_TYPE_MO_DATA = 4;
-  const int SERVICE_TYPE_CS_FALLBACK = 5;
-  const int SERVICE_TYPE_MMTEL_VOICE = 6;
-  const int SERVICE_TYPE_MMTEL_VIDEO = 7;
-  const int SERVICE_TYPE_EMERGENCY = 8;
-  const int SERVICE_TYPE_SMS = 9;
-  const int SERVICE_TYPE_OPERATOR_1 = 1001;
-  const int SERVICE_TYPE_OPERATOR_2 = 1002;
-  const int SERVICE_TYPE_OPERATOR_3 = 1003;
-  const int SERVICE_TYPE_OPERATOR_4 = 1004;
-  const int SERVICE_TYPE_OPERATOR_5 = 1005;
-  const int SERVICE_TYPE_OPERATOR_6 = 1006;
-  const int SERVICE_TYPE_OPERATOR_7 = 1007;
-  const int SERVICE_TYPE_OPERATOR_8 = 1008;
-  const int SERVICE_TYPE_OPERATOR_9 = 1009;
-  const int SERVICE_TYPE_OPERATOR_10 = 1010;
-  const int SERVICE_TYPE_OPERATOR_11 = 1011;
-  const int SERVICE_TYPE_OPERATOR_12 = 1012;
-  const int SERVICE_TYPE_OPERATOR_13 = 1013;
-  const int SERVICE_TYPE_OPERATOR_14 = 1014;
-  const int SERVICE_TYPE_OPERATOR_15 = 1015;
-  const int SERVICE_TYPE_OPERATOR_16 = 1016;
-  const int SERVICE_TYPE_OPERATOR_17 = 1017;
-  const int SERVICE_TYPE_OPERATOR_18 = 1018;
-  const int SERVICE_TYPE_OPERATOR_19 = 1019;
-  const int SERVICE_TYPE_OPERATOR_20 = 1020;
-  const int SERVICE_TYPE_OPERATOR_21 = 1021;
-  const int SERVICE_TYPE_OPERATOR_22 = 1022;
-  const int SERVICE_TYPE_OPERATOR_23 = 1023;
-  const int SERVICE_TYPE_OPERATOR_24 = 1024;
-  const int SERVICE_TYPE_OPERATOR_25 = 1025;
-  const int SERVICE_TYPE_OPERATOR_26 = 1026;
-  const int SERVICE_TYPE_OPERATOR_27 = 1027;
-  const int SERVICE_TYPE_OPERATOR_28 = 1028;
-  const int SERVICE_TYPE_OPERATOR_29 = 1029;
-  const int SERVICE_TYPE_OPERATOR_30 = 1030;
-  const int SERVICE_TYPE_OPERATOR_31 = 1031;
-  const int SERVICE_TYPE_OPERATOR_32 = 1032;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/BarringTypeSpecificInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/BarringTypeSpecificInfo.aidl
deleted file mode 100644
index 03369b9..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/BarringTypeSpecificInfo.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable BarringTypeSpecificInfo {
-  int factor;
-  int timeSeconds;
-  boolean isBarred;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/Cdma2000RegistrationInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/Cdma2000RegistrationInfo.aidl
deleted file mode 100644
index bc9c0ba..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/Cdma2000RegistrationInfo.aidl
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable Cdma2000RegistrationInfo {
-  boolean cssSupported;
-  int roamingIndicator;
-  int systemIsInPrl;
-  int defaultRoamingIndicator;
-  const int PRL_INDICATOR_NOT_REGISTERED = (-1) /* -1 */;
-  const int PRL_INDICATOR_NOT_IN_PRL = 0;
-  const int PRL_INDICATOR_IN_PRL = 1;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CdmaRoamingType.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CdmaRoamingType.aidl
deleted file mode 100644
index 84532e3..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CdmaRoamingType.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum CdmaRoamingType {
-  HOME_NETWORK,
-  AFFILIATED_ROAM,
-  ANY_ROAM,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CdmaSignalStrength.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CdmaSignalStrength.aidl
deleted file mode 100644
index 94430a8..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CdmaSignalStrength.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CdmaSignalStrength {
-  int dbm;
-  int ecio;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellConnectionStatus.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellConnectionStatus.aidl
deleted file mode 100644
index 3775a40..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellConnectionStatus.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum CellConnectionStatus {
-  NONE,
-  PRIMARY_SERVING,
-  SECONDARY_SERVING,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentity.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentity.aidl
deleted file mode 100644
index ba27b39..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentity.aidl
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-union CellIdentity {
-  boolean noinit;
-  android.hardware.radio.network.CellIdentityGsm gsm;
-  android.hardware.radio.network.CellIdentityWcdma wcdma;
-  android.hardware.radio.network.CellIdentityTdscdma tdscdma;
-  android.hardware.radio.network.CellIdentityCdma cdma;
-  android.hardware.radio.network.CellIdentityLte lte;
-  android.hardware.radio.network.CellIdentityNr nr;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentityCdma.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentityCdma.aidl
deleted file mode 100644
index 63571bb..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentityCdma.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CellIdentityCdma {
-  int networkId;
-  int systemId;
-  int baseStationId;
-  int longitude;
-  int latitude;
-  android.hardware.radio.network.OperatorInfo operatorNames;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentityGsm.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentityGsm.aidl
deleted file mode 100644
index 5040f20..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentityGsm.aidl
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CellIdentityGsm {
-  String mcc;
-  String mnc;
-  int lac;
-  int cid;
-  int arfcn;
-  byte bsic;
-  android.hardware.radio.network.OperatorInfo operatorNames;
-  String[] additionalPlmns;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentityLte.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentityLte.aidl
deleted file mode 100644
index be7821d..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentityLte.aidl
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CellIdentityLte {
-  String mcc;
-  String mnc;
-  int ci;
-  int pci;
-  int tac;
-  int earfcn;
-  android.hardware.radio.network.OperatorInfo operatorNames;
-  int bandwidth;
-  String[] additionalPlmns;
-  @nullable android.hardware.radio.network.ClosedSubscriberGroupInfo csgInfo;
-  android.hardware.radio.network.EutranBands[] bands;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentityNr.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentityNr.aidl
deleted file mode 100644
index 6f4f9a0..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentityNr.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CellIdentityNr {
-  String mcc;
-  String mnc;
-  long nci;
-  int pci;
-  int tac;
-  int nrarfcn;
-  android.hardware.radio.network.OperatorInfo operatorNames;
-  String[] additionalPlmns;
-  android.hardware.radio.network.NgranBands[] bands;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentityTdscdma.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentityTdscdma.aidl
deleted file mode 100644
index 864a886..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentityTdscdma.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CellIdentityTdscdma {
-  String mcc;
-  String mnc;
-  int lac;
-  int cid;
-  int cpid;
-  int uarfcn;
-  android.hardware.radio.network.OperatorInfo operatorNames;
-  String[] additionalPlmns;
-  @nullable android.hardware.radio.network.ClosedSubscriberGroupInfo csgInfo;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentityWcdma.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentityWcdma.aidl
deleted file mode 100644
index 4e76277..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellIdentityWcdma.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CellIdentityWcdma {
-  String mcc;
-  String mnc;
-  int lac;
-  int cid;
-  int psc;
-  int uarfcn;
-  android.hardware.radio.network.OperatorInfo operatorNames;
-  String[] additionalPlmns;
-  @nullable android.hardware.radio.network.ClosedSubscriberGroupInfo csgInfo;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfo.aidl
deleted file mode 100644
index 53d485a..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfo.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CellInfo {
-  boolean registered;
-  android.hardware.radio.network.CellConnectionStatus connectionStatus = android.hardware.radio.network.CellConnectionStatus.NONE;
-  android.hardware.radio.network.CellInfoRatSpecificInfo ratSpecificInfo;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoCdma.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoCdma.aidl
deleted file mode 100644
index 6d76a26..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoCdma.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CellInfoCdma {
-  android.hardware.radio.network.CellIdentityCdma cellIdentityCdma;
-  android.hardware.radio.network.CdmaSignalStrength signalStrengthCdma;
-  android.hardware.radio.network.EvdoSignalStrength signalStrengthEvdo;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoGsm.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoGsm.aidl
deleted file mode 100644
index 2074c2f..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoGsm.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CellInfoGsm {
-  android.hardware.radio.network.CellIdentityGsm cellIdentityGsm;
-  android.hardware.radio.network.GsmSignalStrength signalStrengthGsm;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoLte.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoLte.aidl
deleted file mode 100644
index aa3b310..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoLte.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CellInfoLte {
-  android.hardware.radio.network.CellIdentityLte cellIdentityLte;
-  android.hardware.radio.network.LteSignalStrength signalStrengthLte;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoNr.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoNr.aidl
deleted file mode 100644
index a8f49af..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoNr.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CellInfoNr {
-  android.hardware.radio.network.CellIdentityNr cellIdentityNr;
-  android.hardware.radio.network.NrSignalStrength signalStrengthNr;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoRatSpecificInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoRatSpecificInfo.aidl
deleted file mode 100644
index fd3239d..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoRatSpecificInfo.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-union CellInfoRatSpecificInfo {
-  android.hardware.radio.network.CellInfoGsm gsm;
-  android.hardware.radio.network.CellInfoWcdma wcdma;
-  android.hardware.radio.network.CellInfoTdscdma tdscdma;
-  android.hardware.radio.network.CellInfoLte lte;
-  android.hardware.radio.network.CellInfoNr nr;
-  android.hardware.radio.network.CellInfoCdma cdma;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoTdscdma.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoTdscdma.aidl
deleted file mode 100644
index 1a03f34..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoTdscdma.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CellInfoTdscdma {
-  android.hardware.radio.network.CellIdentityTdscdma cellIdentityTdscdma;
-  android.hardware.radio.network.TdscdmaSignalStrength signalStrengthTdscdma;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoWcdma.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoWcdma.aidl
deleted file mode 100644
index d02824d..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellInfoWcdma.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CellInfoWcdma {
-  android.hardware.radio.network.CellIdentityWcdma cellIdentityWcdma;
-  android.hardware.radio.network.WcdmaSignalStrength signalStrengthWcdma;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellularIdentifier.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellularIdentifier.aidl
deleted file mode 100644
index d38494f..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellularIdentifier.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum CellularIdentifier {
-  UNKNOWN = 0,
-  IMSI = 1,
-  IMEI = 2,
-  SUCI = 3,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellularIdentifierDisclosure.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellularIdentifierDisclosure.aidl
deleted file mode 100644
index 540dc1e..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/CellularIdentifierDisclosure.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CellularIdentifierDisclosure {
-  String plmn;
-  android.hardware.radio.network.CellularIdentifier identifier = android.hardware.radio.network.CellularIdentifier.UNKNOWN;
-  android.hardware.radio.network.NasProtocolMessage protocolMessage = android.hardware.radio.network.NasProtocolMessage.UNKNOWN;
-  boolean isEmergency;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/ClosedSubscriberGroupInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/ClosedSubscriberGroupInfo.aidl
deleted file mode 100644
index b9e6f82..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/ClosedSubscriberGroupInfo.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable ClosedSubscriberGroupInfo {
-  boolean csgIndication;
-  String homeNodebName;
-  int csgIdentity;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/ConnectionEvent.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/ConnectionEvent.aidl
deleted file mode 100644
index 1529512..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/ConnectionEvent.aidl
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum ConnectionEvent {
-  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_SIP_SOS = 7,
-  VOLTE_RTP = 8,
-  VOLTE_RTP_SOS = 9,
-  NAS_SIGNALLING_5G = 10,
-  AS_SIGNALLING_5G = 11,
-  VONR_SIP = 12,
-  VONR_SIP_SOS = 13,
-  VONR_RTP = 14,
-  VONR_RTP_SOS = 15,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/Domain.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/Domain.aidl
deleted file mode 100644
index 81c286a..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/Domain.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum Domain {
-  INVALID = 0,
-  CS = (1 << 0) /* 1 */,
-  PS = (1 << 1) /* 2 */,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EmergencyMode.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EmergencyMode.aidl
deleted file mode 100644
index 93c32fb..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EmergencyMode.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-enum EmergencyMode {
-  EMERGENCY_WWAN = 1,
-  EMERGENCY_WLAN = 2,
-  EMERGENCY_CALLBACK = 3,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EmergencyNetworkScanTrigger.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EmergencyNetworkScanTrigger.aidl
deleted file mode 100644
index 7273a94..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EmergencyNetworkScanTrigger.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable EmergencyNetworkScanTrigger {
-  android.hardware.radio.AccessNetwork[] accessNetwork;
-  android.hardware.radio.network.EmergencyScanType scanType = android.hardware.radio.network.EmergencyScanType.NO_PREFERENCE;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EmergencyRegResult.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EmergencyRegResult.aidl
deleted file mode 100644
index 47940f3..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EmergencyRegResult.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable EmergencyRegResult {
-  android.hardware.radio.AccessNetwork accessNetwork = android.hardware.radio.AccessNetwork.UNKNOWN;
-  android.hardware.radio.network.RegState regState = android.hardware.radio.network.RegState.NOT_REG_MT_NOT_SEARCHING_OP;
-  android.hardware.radio.network.Domain emcDomain = android.hardware.radio.network.Domain.INVALID;
-  boolean isVopsSupported;
-  boolean isEmcBearerSupported;
-  byte nwProvidedEmc;
-  byte nwProvidedEmf;
-  String mcc = "";
-  String mnc = "";
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EmergencyScanType.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EmergencyScanType.aidl
deleted file mode 100644
index 0681a73..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EmergencyScanType.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum EmergencyScanType {
-  NO_PREFERENCE = 0,
-  LIMITED_SERVICE = 1,
-  FULL_SERVICE = 2,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EutranBands.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EutranBands.aidl
deleted file mode 100644
index 82257ec..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EutranBands.aidl
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum EutranBands {
-  BAND_1 = 1,
-  BAND_2 = 2,
-  BAND_3 = 3,
-  BAND_4 = 4,
-  BAND_5 = 5,
-  BAND_6 = 6,
-  BAND_7 = 7,
-  BAND_8 = 8,
-  BAND_9 = 9,
-  BAND_10 = 10,
-  BAND_11 = 11,
-  BAND_12 = 12,
-  BAND_13 = 13,
-  BAND_14 = 14,
-  BAND_17 = 17,
-  BAND_18 = 18,
-  BAND_19 = 19,
-  BAND_20 = 20,
-  BAND_21 = 21,
-  BAND_22 = 22,
-  BAND_23 = 23,
-  BAND_24 = 24,
-  BAND_25 = 25,
-  BAND_26 = 26,
-  BAND_27 = 27,
-  BAND_28 = 28,
-  BAND_30 = 30,
-  BAND_31 = 31,
-  BAND_33 = 33,
-  BAND_34 = 34,
-  BAND_35 = 35,
-  BAND_36 = 36,
-  BAND_37 = 37,
-  BAND_38 = 38,
-  BAND_39 = 39,
-  BAND_40 = 40,
-  BAND_41 = 41,
-  BAND_42 = 42,
-  BAND_43 = 43,
-  BAND_44 = 44,
-  BAND_45 = 45,
-  BAND_46 = 46,
-  BAND_47 = 47,
-  BAND_48 = 48,
-  BAND_65 = 65,
-  BAND_66 = 66,
-  BAND_68 = 68,
-  BAND_70 = 70,
-  BAND_49 = 49,
-  BAND_50 = 50,
-  BAND_51 = 51,
-  BAND_52 = 52,
-  BAND_53 = 53,
-  BAND_71 = 71,
-  BAND_72 = 72,
-  BAND_73 = 73,
-  BAND_74 = 74,
-  BAND_85 = 85,
-  BAND_87 = 87,
-  BAND_88 = 88,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EutranRegistrationInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EutranRegistrationInfo.aidl
deleted file mode 100644
index 2ff454c..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EutranRegistrationInfo.aidl
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable EutranRegistrationInfo {
-  android.hardware.radio.network.LteVopsInfo lteVopsInfo;
-  android.hardware.radio.network.NrIndicators nrIndicators;
-  android.hardware.radio.network.EutranRegistrationInfo.AttachResultType lteAttachResultType = android.hardware.radio.network.EutranRegistrationInfo.AttachResultType.NONE;
-  int extraInfo;
-  const int EXTRA_CSFB_NOT_PREFERRED = (1 << 0) /* 1 */;
-  const int EXTRA_SMS_ONLY = (1 << 1) /* 2 */;
-  enum AttachResultType {
-    NONE,
-    EPS_ONLY,
-    COMBINED,
-  }
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EvdoSignalStrength.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EvdoSignalStrength.aidl
deleted file mode 100644
index e97e17d..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/EvdoSignalStrength.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable EvdoSignalStrength {
-  int dbm;
-  int ecio;
-  int signalNoiseRatio;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/GeranBands.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/GeranBands.aidl
deleted file mode 100644
index ee0d419..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/GeranBands.aidl
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum GeranBands {
-  BAND_T380 = 1,
-  BAND_T410 = 2,
-  BAND_450 = 3,
-  BAND_480 = 4,
-  BAND_710 = 5,
-  BAND_750 = 6,
-  BAND_T810 = 7,
-  BAND_850 = 8,
-  BAND_P900 = 9,
-  BAND_E900 = 10,
-  BAND_R900 = 11,
-  BAND_DCS1800 = 12,
-  BAND_PCS1900 = 13,
-  BAND_ER900 = 14,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/GsmSignalStrength.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/GsmSignalStrength.aidl
deleted file mode 100644
index 65847ef..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/GsmSignalStrength.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable GsmSignalStrength {
-  int signalStrength;
-  int bitErrorRate;
-  int timingAdvance;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/IRadioNetwork.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/IRadioNetwork.aidl
deleted file mode 100644
index 8af617f..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/IRadioNetwork.aidl
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@VintfStability
-interface IRadioNetwork {
-  oneway void getAllowedNetworkTypesBitmap(in int serial);
-  oneway void getAvailableBandModes(in int serial);
-  oneway void getAvailableNetworks(in int serial);
-  oneway void getBarringInfo(in int serial);
-  oneway void getCdmaRoamingPreference(in int serial);
-  oneway void getCellInfoList(in int serial);
-  oneway void getDataRegistrationState(in int serial);
-  /**
-   * @deprecated Deprecated starting from Android U.
-   */
-  oneway void getImsRegistrationState(in int serial);
-  oneway void getNetworkSelectionMode(in int serial);
-  oneway void getOperator(in int serial);
-  oneway void getSignalStrength(in int serial);
-  oneway void getSystemSelectionChannels(in int serial);
-  oneway void getVoiceRadioTechnology(in int serial);
-  oneway void getVoiceRegistrationState(in int serial);
-  oneway void isNrDualConnectivityEnabled(in int serial);
-  oneway void responseAcknowledgement();
-  oneway void setAllowedNetworkTypesBitmap(in int serial, in int networkTypeBitmap);
-  oneway void setBandMode(in int serial, in android.hardware.radio.network.RadioBandMode mode);
-  oneway void setBarringPassword(in int serial, in String facility, in String oldPassword, in String newPassword);
-  oneway void setCdmaRoamingPreference(in int serial, in android.hardware.radio.network.CdmaRoamingType type);
-  oneway void setCellInfoListRate(in int serial, in int rate);
-  oneway void setIndicationFilter(in int serial, in int indicationFilter);
-  oneway void setLinkCapacityReportingCriteria(in int serial, in int hysteresisMs, in int hysteresisDlKbps, in int hysteresisUlKbps, in int[] thresholdsDownlinkKbps, in int[] thresholdsUplinkKbps, in android.hardware.radio.AccessNetwork accessNetwork);
-  oneway void setLocationUpdates(in int serial, in boolean enable);
-  oneway void setNetworkSelectionModeAutomatic(in int serial);
-  oneway void setNetworkSelectionModeManual(in int serial, in String operatorNumeric, in android.hardware.radio.AccessNetwork ran);
-  oneway void setNrDualConnectivityState(in int serial, in android.hardware.radio.network.NrDualConnectivityState nrDualConnectivityState);
-  oneway void setResponseFunctions(in android.hardware.radio.network.IRadioNetworkResponse radioNetworkResponse, in android.hardware.radio.network.IRadioNetworkIndication radioNetworkIndication);
-  oneway void setSignalStrengthReportingCriteria(in int serial, in android.hardware.radio.network.SignalThresholdInfo[] signalThresholdInfos);
-  oneway void setSuppServiceNotifications(in int serial, in boolean enable);
-  oneway void setSystemSelectionChannels(in int serial, in boolean specifyChannels, in android.hardware.radio.network.RadioAccessSpecifier[] specifiers);
-  oneway void startNetworkScan(in int serial, in android.hardware.radio.network.NetworkScanRequest request);
-  oneway void stopNetworkScan(in int serial);
-  oneway void supplyNetworkDepersonalization(in int serial, in String netPin);
-  oneway void setUsageSetting(in int serial, in android.hardware.radio.network.UsageSetting usageSetting);
-  oneway void getUsageSetting(in int serial);
-  oneway void setEmergencyMode(int serial, in android.hardware.radio.network.EmergencyMode emcModeType);
-  oneway void triggerEmergencyNetworkScan(int serial, in android.hardware.radio.network.EmergencyNetworkScanTrigger request);
-  oneway void cancelEmergencyNetworkScan(int serial, boolean resetScan);
-  oneway void exitEmergencyMode(in int serial);
-  oneway void setNullCipherAndIntegrityEnabled(in int serial, in boolean enabled);
-  oneway void isNullCipherAndIntegrityEnabled(in int serial);
-  oneway void isN1ModeEnabled(in int serial);
-  oneway void setN1ModeEnabled(in int serial, boolean enable);
-  oneway void isCellularIdentifierTransparencyEnabled(in int serial);
-  oneway void setCellularIdentifierTransparencyEnabled(in int serial, in boolean enabled);
-  oneway void setSecurityAlgorithmsUpdatedEnabled(in int serial, boolean enable);
-  oneway void isSecurityAlgorithmsUpdatedEnabled(in int serial);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/IRadioNetworkIndication.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/IRadioNetworkIndication.aidl
deleted file mode 100644
index 8eea14f..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/IRadioNetworkIndication.aidl
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@VintfStability
-interface IRadioNetworkIndication {
-  oneway void barringInfoChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.CellIdentity cellIdentity, in android.hardware.radio.network.BarringInfo[] barringInfos);
-  oneway void cdmaPrlChanged(in android.hardware.radio.RadioIndicationType type, in int version);
-  oneway void cellInfoList(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.CellInfo[] records);
-  oneway void currentLinkCapacityEstimate(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.LinkCapacityEstimate lce);
-  oneway void currentPhysicalChannelConfigs(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.PhysicalChannelConfig[] configs);
-  oneway void currentSignalStrength(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.SignalStrength signalStrength);
-  oneway void imsNetworkStateChanged(in android.hardware.radio.RadioIndicationType type);
-  oneway void networkScanResult(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.NetworkScanResult result);
-  oneway void networkStateChanged(in android.hardware.radio.RadioIndicationType type);
-  oneway void nitzTimeReceived(in android.hardware.radio.RadioIndicationType type, in String nitzTime, in long receivedTimeMs, in long ageMs);
-  oneway void registrationFailed(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.CellIdentity cellIdentity, in String chosenPlmn, in int domain, in int causeCode, in int additionalCauseCode);
-  oneway void restrictedStateChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.PhoneRestrictedState state);
-  oneway void suppSvcNotify(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.SuppSvcNotification suppSvc);
-  oneway void voiceRadioTechChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.RadioTechnology rat);
-  oneway void emergencyNetworkScanResult(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.EmergencyRegResult result);
-  oneway void cellularIdentifierDisclosed(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.CellularIdentifierDisclosure disclosure);
-  oneway void securityAlgorithmsUpdated(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.SecurityAlgorithmUpdate securityAlgorithmUpdate);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/IRadioNetworkResponse.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/IRadioNetworkResponse.aidl
deleted file mode 100644
index e7f2918..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/IRadioNetworkResponse.aidl
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@VintfStability
-interface IRadioNetworkResponse {
-  oneway void acknowledgeRequest(in int serial);
-  oneway void getAllowedNetworkTypesBitmapResponse(in android.hardware.radio.RadioResponseInfo info, in int networkTypeBitmap);
-  oneway void getAvailableBandModesResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.RadioBandMode[] bandModes);
-  oneway void getAvailableNetworksResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.OperatorInfo[] networkInfos);
-  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);
-  oneway void getDataRegistrationStateResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.RegStateResult dataRegResponse);
-  /**
-   * @deprecated Deprecated starting from Android U.
-   */
-  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);
-  oneway void getOperatorResponse(in android.hardware.radio.RadioResponseInfo info, in String longName, in String shortName, in String numeric);
-  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);
-  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);
-  oneway void setBandModeResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setBarringPasswordResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setCdmaRoamingPreferenceResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setCellInfoListRateResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setIndicationFilterResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setLinkCapacityReportingCriteriaResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setLocationUpdatesResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setNetworkSelectionModeAutomaticResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setNetworkSelectionModeManualResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setNrDualConnectivityStateResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setSignalStrengthReportingCriteriaResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setSuppServiceNotificationsResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setSystemSelectionChannelsResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void startNetworkScanResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void stopNetworkScanResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void supplyNetworkDepersonalizationResponse(in android.hardware.radio.RadioResponseInfo info, in int remainingRetries);
-  oneway void setUsageSettingResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void getUsageSettingResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.UsageSetting usageSetting);
-  oneway void setEmergencyModeResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.EmergencyRegResult regState);
-  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 setNullCipherAndIntegrityEnabledResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void isNullCipherAndIntegrityEnabledResponse(in android.hardware.radio.RadioResponseInfo info, in boolean isEnabled);
-  oneway void isN1ModeEnabledResponse(in android.hardware.radio.RadioResponseInfo info, boolean isEnabled);
-  oneway void setN1ModeEnabledResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void isCellularIdentifierTransparencyEnabledResponse(in android.hardware.radio.RadioResponseInfo info, boolean isEnabled);
-  oneway void setCellularIdentifierTransparencyEnabledResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setSecurityAlgorithmsUpdatedEnabledResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void isSecurityAlgorithmsUpdatedEnabledResponse(in android.hardware.radio.RadioResponseInfo info, in boolean isEnabled);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/IndicationFilter.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/IndicationFilter.aidl
deleted file mode 100644
index 7847fbe..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/IndicationFilter.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum IndicationFilter {
-  NONE = 0,
-  ALL = (~0) /* -1 */,
-  SIGNAL_STRENGTH = (1 << 0) /* 1 */,
-  FULL_NETWORK_STATE = (1 << 1) /* 2 */,
-  DATA_CALL_DORMANCY_CHANGED = (1 << 2) /* 4 */,
-  LINK_CAPACITY_ESTIMATE = (1 << 3) /* 8 */,
-  PHYSICAL_CHANNEL_CONFIG = (1 << 4) /* 16 */,
-  REGISTRATION_FAILURE = (1 << 5) /* 32 */,
-  BARRING_INFO = (1 << 6) /* 64 */,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/LceDataInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/LceDataInfo.aidl
deleted file mode 100644
index 6dc6d3e..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/LceDataInfo.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable LceDataInfo {
-  int lastHopCapacityKbps;
-  byte confidenceLevel;
-  boolean lceSuspended;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/LinkCapacityEstimate.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/LinkCapacityEstimate.aidl
deleted file mode 100644
index 3fc4b5c..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/LinkCapacityEstimate.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable LinkCapacityEstimate {
-  int downlinkCapacityKbps;
-  int uplinkCapacityKbps;
-  int secondaryDownlinkCapacityKbps;
-  int secondaryUplinkCapacityKbps;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/LteSignalStrength.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/LteSignalStrength.aidl
deleted file mode 100644
index eb2ca28..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/LteSignalStrength.aidl
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable LteSignalStrength {
-  int signalStrength;
-  int rsrp;
-  int rsrq;
-  int rssnr;
-  int cqi;
-  int timingAdvance;
-  int cqiTableIndex;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/LteVopsInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/LteVopsInfo.aidl
deleted file mode 100644
index f8d3aa1..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/LteVopsInfo.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable LteVopsInfo {
-  boolean isVopsSupported;
-  boolean isEmcBearerSupported;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NasProtocolMessage.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NasProtocolMessage.aidl
deleted file mode 100644
index 4fbc802..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NasProtocolMessage.aidl
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum NasProtocolMessage {
-  UNKNOWN = 0,
-  ATTACH_REQUEST = 1,
-  IDENTITY_RESPONSE = 2,
-  DETACH_REQUEST = 3,
-  TRACKING_AREA_UPDATE_REQUEST = 4,
-  LOCATION_UPDATE_REQUEST = 5,
-  AUTHENTICATION_AND_CIPHERING_RESPONSE = 6,
-  REGISTRATION_REQUEST = 7,
-  DEREGISTRATION_REQUEST = 8,
-  CM_REESTABLISHMENT_REQUEST = 9,
-  CM_SERVICE_REQUEST = 10,
-  IMSI_DETACH_INDICATION = 11,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NetworkScanRequest.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NetworkScanRequest.aidl
deleted file mode 100644
index cdac0be..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NetworkScanRequest.aidl
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-parcelable NetworkScanRequest {
-  int type;
-  int interval;
-  android.hardware.radio.network.RadioAccessSpecifier[] specifiers;
-  int maxSearchTime;
-  boolean incrementalResults;
-  int incrementalResultsPeriodicity;
-  String[] mccMncs;
-  const int RADIO_ACCESS_SPECIFIER_MAX_SIZE = 8;
-  const int INCREMENTAL_RESULTS_PREIODICITY_RANGE_MIN = 1;
-  const int INCREMENTAL_RESULTS_PREIODICITY_RANGE_MAX = 10;
-  const int MAX_SEARCH_TIME_RANGE_MIN = 60;
-  const int MAX_SEARCH_TIME_RANGE_MAX = 3600;
-  const int SCAN_INTERVAL_RANGE_MIN = 5;
-  const int SCAN_INTERVAL_RANGE_MAX = 300;
-  const int SCAN_TYPE_ONE_SHOT = 0;
-  const int SCAN_TYPE_PERIODIC = 1;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NetworkScanResult.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NetworkScanResult.aidl
deleted file mode 100644
index 518a378..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NetworkScanResult.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-parcelable NetworkScanResult {
-  int status;
-  android.hardware.radio.RadioError error = android.hardware.radio.RadioError.NONE;
-  android.hardware.radio.network.CellInfo[] networkInfos;
-  const int SCAN_STATUS_PARTIAL = 1;
-  const int SCAN_STATUS_COMPLETE = 2;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NgranBands.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NgranBands.aidl
deleted file mode 100644
index fb939df..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NgranBands.aidl
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum NgranBands {
-  BAND_1 = 1,
-  BAND_2 = 2,
-  BAND_3 = 3,
-  BAND_5 = 5,
-  BAND_7 = 7,
-  BAND_8 = 8,
-  BAND_12 = 12,
-  BAND_14 = 14,
-  BAND_18 = 18,
-  BAND_20 = 20,
-  BAND_25 = 25,
-  BAND_26 = 26,
-  BAND_28 = 28,
-  BAND_29 = 29,
-  BAND_30 = 30,
-  BAND_34 = 34,
-  BAND_38 = 38,
-  BAND_39 = 39,
-  BAND_40 = 40,
-  BAND_41 = 41,
-  BAND_46 = 46,
-  BAND_48 = 48,
-  BAND_50 = 50,
-  BAND_51 = 51,
-  BAND_53 = 53,
-  BAND_65 = 65,
-  BAND_66 = 66,
-  BAND_70 = 70,
-  BAND_71 = 71,
-  BAND_74 = 74,
-  BAND_75 = 75,
-  BAND_76 = 76,
-  BAND_77 = 77,
-  BAND_78 = 78,
-  BAND_79 = 79,
-  BAND_80 = 80,
-  BAND_81 = 81,
-  BAND_82 = 82,
-  BAND_83 = 83,
-  BAND_84 = 84,
-  BAND_86 = 86,
-  BAND_89 = 89,
-  BAND_90 = 90,
-  BAND_91 = 91,
-  BAND_92 = 92,
-  BAND_93 = 93,
-  BAND_94 = 94,
-  BAND_95 = 95,
-  BAND_96 = 96,
-  BAND_257 = 257,
-  BAND_258 = 258,
-  BAND_260 = 260,
-  BAND_261 = 261,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NrDualConnectivityState.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NrDualConnectivityState.aidl
deleted file mode 100644
index 7af15a7..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NrDualConnectivityState.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="byte") @JavaDerive(toString=true) @VintfStability
-enum NrDualConnectivityState {
-  ENABLE = 1,
-  DISABLE = 2,
-  DISABLE_IMMEDIATE = 3,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NrIndicators.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NrIndicators.aidl
deleted file mode 100644
index efcd6d3..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NrIndicators.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable NrIndicators {
-  boolean isEndcAvailable;
-  boolean isDcNrRestricted;
-  boolean isNrAvailable;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NrSignalStrength.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NrSignalStrength.aidl
deleted file mode 100644
index 45e6ccf..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NrSignalStrength.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable NrSignalStrength {
-  int ssRsrp;
-  int ssRsrq;
-  int ssSinr;
-  int csiRsrp;
-  int csiRsrq;
-  int csiSinr;
-  int csiCqiTableIndex;
-  byte[] csiCqiReport;
-  int timingAdvance = android.hardware.radio.RadioConst.VALUE_UNAVAILABLE /* 2147483647 */;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NrVopsInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NrVopsInfo.aidl
deleted file mode 100644
index 1b5b669..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/NrVopsInfo.aidl
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-parcelable NrVopsInfo {
-  byte vopsSupported;
-  byte emcSupported;
-  byte emfSupported;
-  const byte EMC_INDICATOR_NOT_SUPPORTED = 0;
-  const byte EMC_INDICATOR_NR_CONNECTED_TO_5GCN = 1;
-  const byte EMC_INDICATOR_EUTRA_CONNECTED_TO_5GCN = 2;
-  const byte EMC_INDICATOR_BOTH_NR_EUTRA_CONNECTED_TO_5GCN = 3;
-  const byte EMF_INDICATOR_NOT_SUPPORTED = 0;
-  const byte EMF_INDICATOR_NR_CONNECTED_TO_5GCN = 1;
-  const byte EMF_INDICATOR_EUTRA_CONNECTED_TO_5GCN = 2;
-  const byte EMF_INDICATOR_BOTH_NR_EUTRA_CONNECTED_TO_5GCN = 3;
-  const byte VOPS_INDICATOR_VOPS_NOT_SUPPORTED = 0;
-  const byte VOPS_INDICATOR_VOPS_OVER_3GPP = 1;
-  const byte VOPS_INDICATOR_VOPS_OVER_NON_3GPP = 2;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/OperatorInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/OperatorInfo.aidl
deleted file mode 100644
index abe2bea..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/OperatorInfo.aidl
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable OperatorInfo {
-  String alphaLong;
-  String alphaShort;
-  String operatorNumeric;
-  int status;
-  const int STATUS_UNKNOWN = 0;
-  const int STATUS_AVAILABLE = 1;
-  const int STATUS_CURRENT = 2;
-  const int STATUS_FORBIDDEN = 3;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/PhoneRestrictedState.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/PhoneRestrictedState.aidl
deleted file mode 100644
index 44cab0e..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/PhoneRestrictedState.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum PhoneRestrictedState {
-  NONE = 0x00,
-  CS_EMERGENCY = 0x01,
-  CS_NORMAL = 0x02,
-  CS_ALL = 0x04,
-  PS_ALL = 0x10,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/PhysicalChannelConfig.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/PhysicalChannelConfig.aidl
deleted file mode 100644
index f58e5ed..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/PhysicalChannelConfig.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable PhysicalChannelConfig {
-  android.hardware.radio.network.CellConnectionStatus status = android.hardware.radio.network.CellConnectionStatus.NONE;
-  android.hardware.radio.RadioTechnology rat = android.hardware.radio.RadioTechnology.UNKNOWN;
-  int downlinkChannelNumber;
-  int uplinkChannelNumber;
-  int cellBandwidthDownlinkKhz;
-  int cellBandwidthUplinkKhz;
-  int[] contextIds;
-  int physicalCellId;
-  android.hardware.radio.network.PhysicalChannelConfigBand band;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/PhysicalChannelConfigBand.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/PhysicalChannelConfigBand.aidl
deleted file mode 100644
index 2e50e67..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/PhysicalChannelConfigBand.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-union PhysicalChannelConfigBand {
-  boolean noinit;
-  android.hardware.radio.network.GeranBands geranBand;
-  android.hardware.radio.network.UtranBands utranBand;
-  android.hardware.radio.network.EutranBands eutranBand;
-  android.hardware.radio.network.NgranBands ngranBand;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/RadioAccessSpecifier.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/RadioAccessSpecifier.aidl
deleted file mode 100644
index 9a018f7..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/RadioAccessSpecifier.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable RadioAccessSpecifier {
-  android.hardware.radio.AccessNetwork accessNetwork = android.hardware.radio.AccessNetwork.UNKNOWN;
-  android.hardware.radio.network.RadioAccessSpecifierBands bands;
-  int[] channels;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/RadioAccessSpecifierBands.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/RadioAccessSpecifierBands.aidl
deleted file mode 100644
index 9ba420e..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/RadioAccessSpecifierBands.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-union RadioAccessSpecifierBands {
-  boolean noinit;
-  android.hardware.radio.network.GeranBands[] geranBands;
-  android.hardware.radio.network.UtranBands[] utranBands;
-  android.hardware.radio.network.EutranBands[] eutranBands;
-  android.hardware.radio.network.NgranBands[] ngranBands;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/RadioBandMode.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/RadioBandMode.aidl
deleted file mode 100644
index cbf37b2..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/RadioBandMode.aidl
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-enum RadioBandMode {
-  BAND_MODE_UNSPECIFIED,
-  BAND_MODE_EURO,
-  BAND_MODE_USA,
-  BAND_MODE_JPN,
-  BAND_MODE_AUS,
-  BAND_MODE_AUS_2,
-  BAND_MODE_CELL_800,
-  BAND_MODE_PCS,
-  BAND_MODE_JTACS,
-  BAND_MODE_KOREA_PCS,
-  BAND_MODE_5_450M,
-  BAND_MODE_IMT2000,
-  BAND_MODE_7_700M_2,
-  BAND_MODE_8_1800M,
-  BAND_MODE_9_900M,
-  BAND_MODE_10_800M_2,
-  BAND_MODE_EURO_PAMR_400M,
-  BAND_MODE_AWS,
-  BAND_MODE_USA_2500M,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/RegState.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/RegState.aidl
deleted file mode 100644
index 5e40813..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/RegState.aidl
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-enum RegState {
-  NOT_REG_MT_NOT_SEARCHING_OP = 0,
-  REG_HOME = 1,
-  NOT_REG_MT_SEARCHING_OP = 2,
-  REG_DENIED = 3,
-  UNKNOWN = 4,
-  REG_ROAMING = 5,
-  NOT_REG_MT_NOT_SEARCHING_OP_EM = 10,
-  NOT_REG_MT_SEARCHING_OP_EM = 12,
-  REG_DENIED_EM = 13,
-  UNKNOWN_EM = 14,
-  REG_EM = 20,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/RegStateResult.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/RegStateResult.aidl
deleted file mode 100644
index 814cde8..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/RegStateResult.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable RegStateResult {
-  android.hardware.radio.network.RegState regState = android.hardware.radio.network.RegState.NOT_REG_MT_NOT_SEARCHING_OP;
-  android.hardware.radio.RadioTechnology rat = android.hardware.radio.RadioTechnology.UNKNOWN;
-  android.hardware.radio.network.RegistrationFailCause reasonForDenial = android.hardware.radio.network.RegistrationFailCause.NONE;
-  android.hardware.radio.network.CellIdentity cellIdentity;
-  String registeredPlmn;
-  android.hardware.radio.network.AccessTechnologySpecificInfo accessTechnologySpecificInfo;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/RegistrationFailCause.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/RegistrationFailCause.aidl
deleted file mode 100644
index fcc079e..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/RegistrationFailCause.aidl
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum RegistrationFailCause {
-  NONE = 0,
-  IMSI_UNKNOWN_IN_HLR = 2,
-  ILLEGAL_MS = 3,
-  IMSI_UNKNOWN_IN_VLR = 4,
-  IMEI_NOT_ACCEPTED = 5,
-  ILLEGAL_ME = 6,
-  GPRS_SERVICES_NOT_ALLOWED = 7,
-  GPRS_AND_NON_GPRS_SERVICES_NOT_ALLOWED = 8,
-  MS_IDENTITY_CANNOT_BE_DERIVED_BY_NETWORK = 9,
-  IMPLICITLY_DETACHED = 10,
-  PLMN_NOT_ALLOWED = 11,
-  LOCATION_AREA_NOT_ALLOWED = 12,
-  ROAMING_NOT_ALLOWED = 13,
-  GPRS_SERVICES_NOT_ALLOWED_IN_PLMN = 14,
-  NO_SUITABLE_CELLS = 15,
-  /**
-   * @deprecated MSC_TEMPORARILY_NOT_REACHABLE value is wrong and should not be used. Use MSC_TEMP_NOT_REACHABLE instead.
-   */
-  MSC_TEMPORARILY_NOT_REACHABLE = 15,
-  MSC_TEMP_NOT_REACHABLE = 16,
-  NETWORK_FAILURE = 17,
-  MAC_FAILURE = 20,
-  SYNC_FAILURE = 21,
-  CONGESTION = 22,
-  GSM_AUTHENTICATION_UNACCEPTABLE = 23,
-  NOT_AUTHORIZED_FOR_THIS_CSG = 25,
-  SMS_PROVIDED_BY_GPRS_IN_ROUTING_AREA,
-  SERVICE_OPTION_NOT_SUPPORTED = 32,
-  SERVICE_OPTION_NOT_SUBSCRIBED = 33,
-  SERVICE_OPTION_TEMPORARILY_OUT_OF_ORDER = 34,
-  CALL_CANNOT_BE_IDENTIFIED = 38,
-  NO_PDP_CONTEXT_ACTIVATED = 40,
-  RETRY_UPON_ENTRY_INTO_NEW_CELL_1 = 48,
-  RETRY_UPON_ENTRY_INTO_NEW_CELL_2 = 49,
-  RETRY_UPON_ENTRY_INTO_NEW_CELL_3 = 50,
-  RETRY_UPON_ENTRY_INTO_NEW_CELL_4 = 51,
-  RETRY_UPON_ENTRY_INTO_NEW_CELL_5 = 52,
-  RETRY_UPON_ENTRY_INTO_NEW_CELL_6 = 53,
-  RETRY_UPON_ENTRY_INTO_NEW_CELL_7 = 54,
-  RETRY_UPON_ENTRY_INTO_NEW_CELL_8 = 55,
-  RETRY_UPON_ENTRY_INTO_NEW_CELL_9 = 56,
-  RETRY_UPON_ENTRY_INTO_NEW_CELL_10 = 57,
-  RETRY_UPON_ENTRY_INTO_NEW_CELL_11 = 58,
-  RETRY_UPON_ENTRY_INTO_NEW_CELL_12 = 59,
-  RETRY_UPON_ENTRY_INTO_NEW_CELL_13 = 60,
-  RETRY_UPON_ENTRY_INTO_NEW_CELL_14 = 61,
-  RETRY_UPON_ENTRY_INTO_NEW_CELL_15 = 62,
-  RETRY_UPON_ENTRY_INTO_NEW_CELL_16 = 63,
-  SEMANTICALLY_INCORRECT_MESSAGE = 95,
-  INVALID_MANDATORY_INFORMATION = 96,
-  MESSAGE_TYPE_NON_EXISTENT_OR_NOT_IMPLEMENTED = 97,
-  MESSAGE_TYPE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE = 98,
-  INFORMATION_ELEMENT_NON_EXISTENT_OR_NOT_IMPLEMENTED = 99,
-  CONDITIONAL_IE_ERROR = 100,
-  MESSAGE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE = 101,
-  PROTOCOL_ERROR_UNSPECIFIED = 111,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/SecurityAlgorithm.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/SecurityAlgorithm.aidl
deleted file mode 100644
index c3333bf..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/SecurityAlgorithm.aidl
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum SecurityAlgorithm {
-  A50 = 0,
-  A51 = 1,
-  A52 = 2,
-  A53 = 3,
-  A54 = 4,
-  GEA0 = 14,
-  GEA1 = 15,
-  GEA2 = 16,
-  GEA3 = 17,
-  GEA4 = 18,
-  GEA5 = 19,
-  UEA0 = 29,
-  UEA1 = 30,
-  UEA2 = 31,
-  EEA0 = 41,
-  EEA1 = 42,
-  EEA2 = 43,
-  EEA3 = 44,
-  NEA0 = 55,
-  NEA1 = 56,
-  NEA2 = 57,
-  NEA3 = 58,
-  SIP_NO_IPSEC_CONFIG = 66,
-  IMS_NULL = 67,
-  SIP_NULL = 68,
-  AES_GCM = 69,
-  AES_GMAC = 70,
-  AES_CBC = 71,
-  DES_EDE3_CBC = 72,
-  AES_EDE3_CBC = 73,
-  HMAC_SHA1_96 = 74,
-  HMAC_MD5_96 = 75,
-  RTP = 85,
-  SRTP_NULL = 86,
-  SRTP_AES_COUNTER = 87,
-  SRTP_AES_F8 = 88,
-  SRTP_HMAC_SHA1 = 89,
-  ENCR_AES_GCM_16 = 99,
-  ENCR_AES_CBC = 100,
-  AUTH_HMAC_SHA2_256_128 = 101,
-  UNKNOWN = 113,
-  OTHER = 114,
-  ORYX = 124,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/SecurityAlgorithmUpdate.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/SecurityAlgorithmUpdate.aidl
deleted file mode 100644
index 8613f19..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/SecurityAlgorithmUpdate.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable SecurityAlgorithmUpdate {
-  android.hardware.radio.network.ConnectionEvent connectionEvent = android.hardware.radio.network.ConnectionEvent.CS_SIGNALLING_GSM;
-  android.hardware.radio.network.SecurityAlgorithm encryption = android.hardware.radio.network.SecurityAlgorithm.A50;
-  android.hardware.radio.network.SecurityAlgorithm integrity = android.hardware.radio.network.SecurityAlgorithm.A50;
-  boolean isUnprotectedEmergency;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/SignalStrength.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/SignalStrength.aidl
deleted file mode 100644
index da7db9a..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/SignalStrength.aidl
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable SignalStrength {
-  android.hardware.radio.network.GsmSignalStrength gsm;
-  android.hardware.radio.network.CdmaSignalStrength cdma;
-  android.hardware.radio.network.EvdoSignalStrength evdo;
-  android.hardware.radio.network.LteSignalStrength lte;
-  android.hardware.radio.network.TdscdmaSignalStrength tdscdma;
-  android.hardware.radio.network.WcdmaSignalStrength wcdma;
-  android.hardware.radio.network.NrSignalStrength nr;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/SignalThresholdInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/SignalThresholdInfo.aidl
deleted file mode 100644
index 2041bad..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/SignalThresholdInfo.aidl
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-parcelable SignalThresholdInfo {
-  int signalMeasurement;
-  int hysteresisMs;
-  int hysteresisDb;
-  int[] thresholds;
-  boolean isEnabled;
-  android.hardware.radio.AccessNetwork ran = android.hardware.radio.AccessNetwork.UNKNOWN;
-  const int SIGNAL_MEASUREMENT_TYPE_RSSI = 1;
-  const int SIGNAL_MEASUREMENT_TYPE_RSCP = 2;
-  const int SIGNAL_MEASUREMENT_TYPE_RSRP = 3;
-  const int SIGNAL_MEASUREMENT_TYPE_RSRQ = 4;
-  const int SIGNAL_MEASUREMENT_TYPE_RSSNR = 5;
-  const int SIGNAL_MEASUREMENT_TYPE_SSRSRP = 6;
-  const int SIGNAL_MEASUREMENT_TYPE_SSRSRQ = 7;
-  const int SIGNAL_MEASUREMENT_TYPE_SSSINR = 8;
-  const int SIGNAL_MEASUREMENT_TYPE_ECNO = 9;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/SuppSvcNotification.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/SuppSvcNotification.aidl
deleted file mode 100644
index 5192eae..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/SuppSvcNotification.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable SuppSvcNotification {
-  boolean isMT;
-  int code;
-  int index;
-  int type;
-  String number;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/TdscdmaSignalStrength.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/TdscdmaSignalStrength.aidl
deleted file mode 100644
index fe209e5..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/TdscdmaSignalStrength.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable TdscdmaSignalStrength {
-  int signalStrength;
-  int bitErrorRate;
-  int rscp;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/UsageSetting.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/UsageSetting.aidl
deleted file mode 100644
index a6f4d13..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/UsageSetting.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum UsageSetting {
-  VOICE_CENTRIC = 1,
-  DATA_CENTRIC = 2,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/UtranBands.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/UtranBands.aidl
deleted file mode 100644
index 977afe3..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/UtranBands.aidl
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum UtranBands {
-  BAND_1 = 1,
-  BAND_2 = 2,
-  BAND_3 = 3,
-  BAND_4 = 4,
-  BAND_5 = 5,
-  BAND_6 = 6,
-  BAND_7 = 7,
-  BAND_8 = 8,
-  BAND_9 = 9,
-  BAND_10 = 10,
-  BAND_11 = 11,
-  BAND_12 = 12,
-  BAND_13 = 13,
-  BAND_14 = 14,
-  BAND_19 = 19,
-  BAND_20 = 20,
-  BAND_21 = 21,
-  BAND_22 = 22,
-  BAND_25 = 25,
-  BAND_26 = 26,
-  BAND_A = 101,
-  BAND_B = 102,
-  BAND_C = 103,
-  BAND_D = 104,
-  BAND_E = 105,
-  BAND_F = 106,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/WcdmaSignalStrength.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/WcdmaSignalStrength.aidl
deleted file mode 100644
index b765ab6..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.network/4/android/hardware/radio/network/WcdmaSignalStrength.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.network;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable WcdmaSignalStrength {
-  int signalStrength;
-  int bitErrorRate;
-  int rscp;
-  int ecno;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/.hash b/radio/aidl/aidl_api/android.hardware.radio.sim/4/.hash
deleted file mode 100644
index 8a1cc48..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/.hash
+++ /dev/null
@@ -1 +0,0 @@
-6182aa15eb58e1143638fb9e4c3881568b3910c4
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/AppStatus.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/AppStatus.aidl
deleted file mode 100644
index a3e6d3a..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/AppStatus.aidl
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-parcelable AppStatus {
-  int appType;
-  int appState;
-  android.hardware.radio.sim.PersoSubstate persoSubstate = android.hardware.radio.sim.PersoSubstate.UNKNOWN;
-  String aidPtr;
-  String appLabelPtr;
-  boolean pin1Replaced;
-  android.hardware.radio.sim.PinState pin1 = android.hardware.radio.sim.PinState.UNKNOWN;
-  android.hardware.radio.sim.PinState pin2 = android.hardware.radio.sim.PinState.UNKNOWN;
-  const int APP_STATE_UNKNOWN = 0;
-  const int APP_STATE_DETECTED = 1;
-  const int APP_STATE_PIN = 2;
-  const int APP_STATE_PUK = 3;
-  const int APP_STATE_SUBSCRIPTION_PERSO = 4;
-  const int APP_STATE_READY = 5;
-  const int APP_TYPE_UNKNOWN = 0;
-  const int APP_TYPE_SIM = 1;
-  const int APP_TYPE_USIM = 2;
-  const int APP_TYPE_RUIM = 3;
-  const int APP_TYPE_CSIM = 4;
-  const int APP_TYPE_ISIM = 5;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/CardPowerState.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/CardPowerState.aidl
deleted file mode 100644
index 6a908c4..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/CardPowerState.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-enum CardPowerState {
-  POWER_DOWN,
-  POWER_UP,
-  POWER_UP_PASS_THROUGH,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/CardStatus.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/CardStatus.aidl
deleted file mode 100644
index 0d7e48a..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/CardStatus.aidl
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CardStatus {
-  int cardState;
-  android.hardware.radio.sim.PinState universalPinState = android.hardware.radio.sim.PinState.UNKNOWN;
-  int gsmUmtsSubscriptionAppIndex;
-  int cdmaSubscriptionAppIndex;
-  int imsSubscriptionAppIndex;
-  android.hardware.radio.sim.AppStatus[] applications;
-  String atr;
-  String iccid;
-  String eid;
-  android.hardware.radio.config.SlotPortMapping slotMap;
-  android.hardware.radio.config.MultipleEnabledProfilesMode supportedMepMode = android.hardware.radio.config.MultipleEnabledProfilesMode.NONE;
-  const int STATE_ABSENT = 0;
-  const int STATE_PRESENT = 1;
-  const int STATE_ERROR = 2;
-  const int STATE_RESTRICTED = 3;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/Carrier.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/Carrier.aidl
deleted file mode 100644
index 24fff2e..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/Carrier.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable Carrier {
-  String mcc;
-  String mnc;
-  int matchType;
-  String matchData;
-  const int MATCH_TYPE_ALL = 0;
-  const int MATCH_TYPE_SPN = 1;
-  const int MATCH_TYPE_IMSI_PREFIX = 2;
-  const int MATCH_TYPE_GID1 = 3;
-  const int MATCH_TYPE_GID2 = 4;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/CarrierInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/CarrierInfo.aidl
deleted file mode 100644
index 7d4a54b..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/CarrierInfo.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CarrierInfo {
-  String mcc;
-  String mnc;
-  @nullable String spn;
-  @nullable String gid1;
-  @nullable String gid2;
-  @nullable String imsiPrefix;
-  @nullable List<android.hardware.radio.sim.Plmn> ehplmn;
-  @nullable String iccid;
-  @nullable String impi;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/CarrierRestrictions.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/CarrierRestrictions.aidl
deleted file mode 100644
index 8f5672f..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/CarrierRestrictions.aidl
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CarrierRestrictions {
-  /**
-   * @deprecated use @List<CarrierInfo> allowedCarrierInfoList
-   */
-  android.hardware.radio.sim.Carrier[] allowedCarriers;
-  /**
-   * @deprecated use @List<CarrierInfo> excludedCarrierInfoList
-   */
-  android.hardware.radio.sim.Carrier[] excludedCarriers;
-  boolean allowedCarriersPrioritized;
-  android.hardware.radio.sim.CarrierRestrictions.CarrierRestrictionStatus status = android.hardware.radio.sim.CarrierRestrictions.CarrierRestrictionStatus.UNKNOWN;
-  android.hardware.radio.sim.CarrierInfo[] allowedCarrierInfoList = {};
-  android.hardware.radio.sim.CarrierInfo[] excludedCarrierInfoList = {};
-  @Backing(type="int") @VintfStability
-  enum CarrierRestrictionStatus {
-    UNKNOWN = 0,
-    NOT_RESTRICTED = 1,
-    RESTRICTED = 2,
-  }
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/CdmaSubscriptionSource.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/CdmaSubscriptionSource.aidl
deleted file mode 100644
index 13b06e7..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/CdmaSubscriptionSource.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum CdmaSubscriptionSource {
-  RUIM_SIM,
-  NV,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/IRadioSim.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/IRadioSim.aidl
deleted file mode 100644
index 1728e41..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/IRadioSim.aidl
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@VintfStability
-interface IRadioSim {
-  oneway void areUiccApplicationsEnabled(in int serial);
-  oneway void changeIccPin2ForApp(in int serial, in String oldPin2, in String newPin2, in String aid);
-  oneway void changeIccPinForApp(in int serial, in String oldPin, in String newPin, in String aid);
-  oneway void enableUiccApplications(in int serial, in boolean enable);
-  oneway void getAllowedCarriers(in int serial);
-  oneway void getCdmaSubscription(in int serial);
-  oneway void getCdmaSubscriptionSource(in int serial);
-  oneway void getFacilityLockForApp(in int serial, in String facility, in String password, in int serviceClass, in String appId);
-  oneway void getIccCardStatus(in int serial);
-  oneway void getImsiForApp(in int serial, in String aid);
-  oneway void getSimPhonebookCapacity(in int serial);
-  oneway void getSimPhonebookRecords(in int serial);
-  /**
-   * @deprecated use iccCloseLogicalChannelWithSessionInfo instead.
-   */
-  oneway void iccCloseLogicalChannel(in int serial, in int channelId);
-  oneway void iccIoForApp(in int serial, in android.hardware.radio.sim.IccIo iccIo);
-  oneway void iccOpenLogicalChannel(in int serial, in String aid, in int p2);
-  oneway void iccTransmitApduBasicChannel(in int serial, in android.hardware.radio.sim.SimApdu message);
-  oneway void iccTransmitApduLogicalChannel(in int serial, in android.hardware.radio.sim.SimApdu message);
-  oneway void reportStkServiceIsRunning(in int serial);
-  oneway void requestIccSimAuthentication(in int serial, in int authContext, in String authData, in String aid);
-  oneway void responseAcknowledgement();
-  oneway void sendEnvelope(in int serial, in String contents);
-  oneway void sendEnvelopeWithStatus(in int serial, in String contents);
-  oneway void sendTerminalResponseToSim(in int serial, in String contents);
-  oneway void setAllowedCarriers(in int serial, in android.hardware.radio.sim.CarrierRestrictions carriers, in android.hardware.radio.sim.SimLockMultiSimPolicy multiSimPolicy);
-  oneway void setCarrierInfoForImsiEncryption(in int serial, in android.hardware.radio.sim.ImsiEncryptionInfo imsiEncryptionInfo);
-  oneway void setCdmaSubscriptionSource(in int serial, in android.hardware.radio.sim.CdmaSubscriptionSource cdmaSub);
-  oneway void setFacilityLockForApp(in int serial, in String facility, in boolean lockState, in String password, in int serviceClass, in String appId);
-  oneway void setResponseFunctions(in android.hardware.radio.sim.IRadioSimResponse radioSimResponse, in android.hardware.radio.sim.IRadioSimIndication radioSimIndication);
-  oneway void setSimCardPower(in int serial, in android.hardware.radio.sim.CardPowerState powerUp);
-  oneway void setUiccSubscription(in int serial, in android.hardware.radio.sim.SelectUiccSub uiccSub);
-  oneway void supplyIccPin2ForApp(in int serial, in String pin2, in String aid);
-  oneway void supplyIccPinForApp(in int serial, in String pin, in String aid);
-  oneway void supplyIccPuk2ForApp(in int serial, in String puk2, in String pin2, in String aid);
-  oneway void supplyIccPukForApp(in int serial, in String puk, in String pin, in String aid);
-  oneway void supplySimDepersonalization(in int serial, in android.hardware.radio.sim.PersoSubstate persoType, in String controlKey);
-  oneway void updateSimPhonebookRecords(in int serial, in android.hardware.radio.sim.PhonebookRecordInfo recordInfo);
-  oneway void iccCloseLogicalChannelWithSessionInfo(in int serial, in android.hardware.radio.sim.SessionInfo sessionInfo);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/IRadioSimIndication.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/IRadioSimIndication.aidl
deleted file mode 100644
index a74b65a..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/IRadioSimIndication.aidl
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@VintfStability
-interface IRadioSimIndication {
-  oneway void carrierInfoForImsiEncryption(in android.hardware.radio.RadioIndicationType info);
-  oneway void cdmaSubscriptionSourceChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.sim.CdmaSubscriptionSource cdmaSource);
-  oneway void simPhonebookChanged(in android.hardware.radio.RadioIndicationType type);
-  oneway void simPhonebookRecordsReceived(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.sim.PbReceivedStatus status, in android.hardware.radio.sim.PhonebookRecordInfo[] records);
-  oneway void simRefresh(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.sim.SimRefreshResult refreshResult);
-  oneway void simStatusChanged(in android.hardware.radio.RadioIndicationType type);
-  oneway void stkEventNotify(in android.hardware.radio.RadioIndicationType type, in String cmd);
-  oneway void stkProactiveCommand(in android.hardware.radio.RadioIndicationType type, in String cmd);
-  oneway void stkSessionEnd(in android.hardware.radio.RadioIndicationType type);
-  oneway void subscriptionStatusChanged(in android.hardware.radio.RadioIndicationType type, in boolean activate);
-  oneway void uiccApplicationsEnablementChanged(in android.hardware.radio.RadioIndicationType type, in boolean enabled);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/IRadioSimResponse.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/IRadioSimResponse.aidl
deleted file mode 100644
index c653847..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/IRadioSimResponse.aidl
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@VintfStability
-interface IRadioSimResponse {
-  oneway void acknowledgeRequest(in int serial);
-  oneway void areUiccApplicationsEnabledResponse(in android.hardware.radio.RadioResponseInfo info, in boolean enabled);
-  oneway void changeIccPin2ForAppResponse(in android.hardware.radio.RadioResponseInfo info, in int remainingRetries);
-  oneway void changeIccPinForAppResponse(in android.hardware.radio.RadioResponseInfo info, in int remainingRetries);
-  oneway void enableUiccApplicationsResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void getAllowedCarriersResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.sim.CarrierRestrictions carriers, in android.hardware.radio.sim.SimLockMultiSimPolicy multiSimPolicy);
-  oneway void getCdmaSubscriptionResponse(in android.hardware.radio.RadioResponseInfo info, in String mdn, in String hSid, in String hNid, in String min, in String prl);
-  oneway void getCdmaSubscriptionSourceResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.sim.CdmaSubscriptionSource source);
-  oneway void getFacilityLockForAppResponse(in android.hardware.radio.RadioResponseInfo info, in int response);
-  oneway void getIccCardStatusResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.sim.CardStatus cardStatus);
-  oneway void getImsiForAppResponse(in android.hardware.radio.RadioResponseInfo info, in String imsi);
-  oneway void getSimPhonebookCapacityResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.sim.PhonebookCapacity capacity);
-  oneway void getSimPhonebookRecordsResponse(in android.hardware.radio.RadioResponseInfo info);
-  /**
-   * @deprecated use iccCloseLogicalChannelWithSessionInfoResponse instead.
-   */
-  oneway void iccCloseLogicalChannelResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void iccIoForAppResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.sim.IccIoResult iccIo);
-  oneway void iccOpenLogicalChannelResponse(in android.hardware.radio.RadioResponseInfo info, in int channelId, in byte[] selectResponse);
-  oneway void iccTransmitApduBasicChannelResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.sim.IccIoResult result);
-  oneway void iccTransmitApduLogicalChannelResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.sim.IccIoResult result);
-  oneway void reportStkServiceIsRunningResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void requestIccSimAuthenticationResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.sim.IccIoResult result);
-  oneway void sendEnvelopeResponse(in android.hardware.radio.RadioResponseInfo info, in String commandResponse);
-  oneway void sendEnvelopeWithStatusResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.sim.IccIoResult iccIo);
-  oneway void sendTerminalResponseToSimResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setAllowedCarriersResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setCarrierInfoForImsiEncryptionResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setCdmaSubscriptionSourceResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setFacilityLockForAppResponse(in android.hardware.radio.RadioResponseInfo info, in int retry);
-  oneway void setSimCardPowerResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setUiccSubscriptionResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void supplyIccPin2ForAppResponse(in android.hardware.radio.RadioResponseInfo info, in int remainingRetries);
-  oneway void supplyIccPinForAppResponse(in android.hardware.radio.RadioResponseInfo info, in int remainingRetries);
-  oneway void supplyIccPuk2ForAppResponse(in android.hardware.radio.RadioResponseInfo info, in int remainingRetries);
-  oneway void supplyIccPukForAppResponse(in android.hardware.radio.RadioResponseInfo info, in int remainingRetries);
-  oneway void supplySimDepersonalizationResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.sim.PersoSubstate persoType, in int remainingRetries);
-  oneway void updateSimPhonebookRecordsResponse(in android.hardware.radio.RadioResponseInfo info, in int updatedRecordIndex);
-  oneway void iccCloseLogicalChannelWithSessionInfoResponse(in android.hardware.radio.RadioResponseInfo info);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/IccIo.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/IccIo.aidl
deleted file mode 100644
index 661518d..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/IccIo.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable IccIo {
-  int command;
-  int fileId;
-  String path;
-  int p1;
-  int p2;
-  int p3;
-  String data;
-  String pin2;
-  String aid;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/IccIoResult.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/IccIoResult.aidl
deleted file mode 100644
index 1e418cd..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/IccIoResult.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable IccIoResult {
-  int sw1;
-  int sw2;
-  String simResponse;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/ImsiEncryptionInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/ImsiEncryptionInfo.aidl
deleted file mode 100644
index 40722e5..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/ImsiEncryptionInfo.aidl
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable ImsiEncryptionInfo {
-  String mcc;
-  String mnc;
-  byte[] carrierKey;
-  String keyIdentifier;
-  long expirationTime;
-  byte keyType;
-  const byte PUBLIC_KEY_TYPE_EPDG = 1;
-  const byte PUBLIC_KEY_TYPE_WLAN = 2;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/PbReceivedStatus.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/PbReceivedStatus.aidl
deleted file mode 100644
index 5070ff2..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/PbReceivedStatus.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@Backing(type="byte") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-enum PbReceivedStatus {
-  PB_RECEIVED_OK = 1,
-  PB_RECEIVED_ERROR = 2,
-  PB_RECEIVED_ABORT = 3,
-  PB_RECEIVED_FINAL = 4,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/PersoSubstate.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/PersoSubstate.aidl
deleted file mode 100644
index 7952308..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/PersoSubstate.aidl
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum PersoSubstate {
-  UNKNOWN,
-  IN_PROGRESS,
-  READY,
-  SIM_NETWORK,
-  SIM_NETWORK_SUBSET,
-  SIM_CORPORATE,
-  SIM_SERVICE_PROVIDER,
-  SIM_SIM,
-  SIM_NETWORK_PUK,
-  SIM_NETWORK_SUBSET_PUK,
-  SIM_CORPORATE_PUK,
-  SIM_SERVICE_PROVIDER_PUK,
-  SIM_SIM_PUK,
-  RUIM_NETWORK1,
-  RUIM_NETWORK2,
-  RUIM_HRPD,
-  RUIM_CORPORATE,
-  RUIM_SERVICE_PROVIDER,
-  RUIM_RUIM,
-  RUIM_NETWORK1_PUK,
-  RUIM_NETWORK2_PUK,
-  RUIM_HRPD_PUK,
-  RUIM_CORPORATE_PUK,
-  RUIM_SERVICE_PROVIDER_PUK,
-  RUIM_RUIM_PUK,
-  SIM_SPN,
-  SIM_SPN_PUK,
-  SIM_SP_EHPLMN,
-  SIM_SP_EHPLMN_PUK,
-  SIM_ICCID,
-  SIM_ICCID_PUK,
-  SIM_IMPI,
-  SIM_IMPI_PUK,
-  SIM_NS_SP,
-  SIM_NS_SP_PUK,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/PhonebookCapacity.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/PhonebookCapacity.aidl
deleted file mode 100644
index b020687..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/PhonebookCapacity.aidl
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable PhonebookCapacity {
-  int maxAdnRecords;
-  int usedAdnRecords;
-  int maxEmailRecords;
-  int usedEmailRecords;
-  int maxAdditionalNumberRecords;
-  int usedAdditionalNumberRecords;
-  int maxNameLen;
-  int maxNumberLen;
-  int maxEmailLen;
-  int maxAdditionalNumberLen;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/PhonebookRecordInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/PhonebookRecordInfo.aidl
deleted file mode 100644
index 1a6943b..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/PhonebookRecordInfo.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable PhonebookRecordInfo {
-  int recordId;
-  String name;
-  String number;
-  String[] emails;
-  String[] additionalNumbers;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/PinState.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/PinState.aidl
deleted file mode 100644
index 924929b..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/PinState.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum PinState {
-  UNKNOWN,
-  ENABLED_NOT_VERIFIED,
-  ENABLED_VERIFIED,
-  DISABLED,
-  ENABLED_BLOCKED,
-  ENABLED_PERM_BLOCKED,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/Plmn.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/Plmn.aidl
deleted file mode 100644
index b29a4a7..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/Plmn.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable Plmn {
-  String mcc;
-  String mnc;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/SelectUiccSub.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/SelectUiccSub.aidl
deleted file mode 100644
index 57ca2a5..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/SelectUiccSub.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable SelectUiccSub {
-  int slot;
-  int appIndex;
-  int subType;
-  int actStatus;
-  const int SUBSCRIPTION_TYPE_1 = 0;
-  const int SUBSCRIPTION_TYPE_2 = 1;
-  const int SUBSCRIPTION_TYPE_3 = 2;
-  const int ACT_STATUS_DEACTIVATE = 0;
-  const int ACT_STATUS_ACTIVATE = 1;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/SessionInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/SessionInfo.aidl
deleted file mode 100644
index 5c81e3d..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/SessionInfo.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable SessionInfo {
-  int sessionId;
-  boolean isEs10 = false;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/SimApdu.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/SimApdu.aidl
deleted file mode 100644
index 45f6e48..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/SimApdu.aidl
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable SimApdu {
-  int sessionId;
-  int cla;
-  int instruction;
-  int p1;
-  int p2;
-  int p3;
-  String data;
-  boolean isEs10 = false;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/SimLockMultiSimPolicy.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/SimLockMultiSimPolicy.aidl
deleted file mode 100644
index 75b8f6b..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/SimLockMultiSimPolicy.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-enum SimLockMultiSimPolicy {
-  NO_MULTISIM_POLICY,
-  ONE_VALID_SIM_MUST_BE_PRESENT,
-  APPLY_TO_ALL_SLOTS,
-  APPLY_TO_ONLY_SLOT_1,
-  VALID_SIM_MUST_PRESENT_ON_SLOT_1,
-  ACTIVE_SERVICE_ON_SLOT_1_TO_UNBLOCK_OTHER_SLOTS,
-  ACTIVE_SERVICE_ON_ANY_SLOT_TO_UNBLOCK_OTHER_SLOTS,
-  ALL_SIMS_MUST_BE_VALID,
-  SLOT_POLICY_OTHER,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/SimRefreshResult.aidl b/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/SimRefreshResult.aidl
deleted file mode 100644
index c546565..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.sim/4/android/hardware/radio/sim/SimRefreshResult.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.sim;
-/* @hide */
-@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-parcelable SimRefreshResult {
-  int type;
-  int efId;
-  String aid;
-  const int TYPE_SIM_FILE_UPDATE = 0;
-  const int TYPE_SIM_INIT = 1;
-  const int TYPE_SIM_RESET = 2;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/.hash b/radio/aidl/aidl_api/android.hardware.radio.voice/4/.hash
deleted file mode 100644
index e3334b9..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/.hash
+++ /dev/null
@@ -1 +0,0 @@
-c18717da4182fd6a3eb5f6f850e8b3a8f3178ce1
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/AudioQuality.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/AudioQuality.aidl
deleted file mode 100644
index 8725c7f..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/AudioQuality.aidl
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum AudioQuality {
-  UNSPECIFIED,
-  AMR,
-  AMR_WB,
-  GSM_EFR,
-  GSM_FR,
-  GSM_HR,
-  EVRC,
-  EVRC_B,
-  EVRC_WB,
-  EVRC_NW,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/Call.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/Call.aidl
deleted file mode 100644
index 27130b4..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/Call.aidl
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable Call {
-  int state;
-  int index;
-  int toa;
-  boolean isMpty;
-  boolean isMT;
-  byte als;
-  boolean isVoice;
-  boolean isVoicePrivacy;
-  String number;
-  int numberPresentation;
-  String name;
-  int namePresentation;
-  android.hardware.radio.voice.UusInfo[] uusInfo;
-  android.hardware.radio.voice.AudioQuality audioQuality = android.hardware.radio.voice.AudioQuality.UNSPECIFIED;
-  String forwardedNumber;
-  const int PRESENTATION_ALLOWED = 0;
-  const int PRESENTATION_RESTRICTED = 1;
-  const int PRESENTATION_UNKNOWN = 2;
-  const int PRESENTATION_PAYPHONE = 3;
-  const int STATE_ACTIVE = 0;
-  const int STATE_HOLDING = 1;
-  const int STATE_DIALING = 2;
-  const int STATE_ALERTING = 3;
-  const int STATE_INCOMING = 4;
-  const int STATE_WAITING = 5;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CallForwardInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CallForwardInfo.aidl
deleted file mode 100644
index 51c8758..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CallForwardInfo.aidl
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CallForwardInfo {
-  int status;
-  int reason;
-  int serviceClass;
-  int toa;
-  String number;
-  int timeSeconds;
-  const int STATUS_DISABLE = 0;
-  const int STATUS_ENABLE = 1;
-  const int STATUS_INTERROGATE = 2;
-  const int STATUS_REGISTRATION = 3;
-  const int STATUS_ERASURE = 4;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaCallWaiting.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaCallWaiting.aidl
deleted file mode 100644
index 0b36be4..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaCallWaiting.aidl
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CdmaCallWaiting {
-  String number;
-  int numberPresentation;
-  String name;
-  android.hardware.radio.voice.CdmaSignalInfoRecord signalInfoRecord;
-  int numberType;
-  int numberPlan;
-  const int NUMBER_PLAN_UNKNOWN = 0;
-  const int NUMBER_PLAN_ISDN = 1;
-  const int NUMBER_PLAN_DATA = 3;
-  const int NUMBER_PLAN_TELEX = 4;
-  const int NUMBER_PLAN_NATIONAL = 8;
-  const int NUMBER_PLAN_PRIVATE = 9;
-  const int NUMBER_PRESENTATION_ALLOWED = 0;
-  const int NUMBER_PRESENTATION_RESTRICTED = 1;
-  const int NUMBER_PRESENTATION_UNKNOWN = 2;
-  const int NUMBER_TYPE_UNKNOWN = 0;
-  const int NUMBER_TYPE_INTERNATIONAL = 1;
-  const int NUMBER_TYPE_NATIONAL = 2;
-  const int NUMBER_TYPE_NETWORK_SPECIFIC = 3;
-  const int NUMBER_TYPE_SUBSCRIBER = 4;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaDisplayInfoRecord.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaDisplayInfoRecord.aidl
deleted file mode 100644
index 0142792..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaDisplayInfoRecord.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-parcelable CdmaDisplayInfoRecord {
-  String alphaBuf;
-  const int CDMA_ALPHA_INFO_BUFFER_LENGTH = 64;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaInformationRecord.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaInformationRecord.aidl
deleted file mode 100644
index c71a8be..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaInformationRecord.aidl
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-parcelable CdmaInformationRecord {
-  int name;
-  android.hardware.radio.voice.CdmaDisplayInfoRecord[] display;
-  android.hardware.radio.voice.CdmaNumberInfoRecord[] number;
-  android.hardware.radio.voice.CdmaSignalInfoRecord[] signal;
-  android.hardware.radio.voice.CdmaRedirectingNumberInfoRecord[] redir;
-  android.hardware.radio.voice.CdmaLineControlInfoRecord[] lineCtrl;
-  android.hardware.radio.voice.CdmaT53ClirInfoRecord[] clir;
-  android.hardware.radio.voice.CdmaT53AudioControlInfoRecord[] audioCtrl;
-  const int CDMA_MAX_NUMBER_OF_INFO_RECS = 10;
-  const int NAME_DISPLAY = 0;
-  const int NAME_CALLED_PARTY_NUMBER = 1;
-  const int NAME_CALLING_PARTY_NUMBER = 2;
-  const int NAME_CONNECTED_NUMBER = 3;
-  const int NAME_SIGNAL = 4;
-  const int NAME_REDIRECTING_NUMBER = 5;
-  const int NAME_LINE_CONTROL = 6;
-  const int NAME_EXTENDED_DISPLAY = 7;
-  const int NAME_T53_CLIR = 8;
-  const int NAME_T53_RELEASE = 9;
-  const int NAME_T53_AUDIO_CONTROL = 10;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaLineControlInfoRecord.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaLineControlInfoRecord.aidl
deleted file mode 100644
index 4e4a7ee..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaLineControlInfoRecord.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CdmaLineControlInfoRecord {
-  byte lineCtrlPolarityIncluded;
-  byte lineCtrlToggle;
-  byte lineCtrlReverse;
-  byte lineCtrlPowerDenial;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaNumberInfoRecord.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaNumberInfoRecord.aidl
deleted file mode 100644
index 974e795..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaNumberInfoRecord.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-parcelable CdmaNumberInfoRecord {
-  String number;
-  byte numberType;
-  byte numberPlan;
-  byte pi;
-  byte si;
-  const int CDMA_NUMBER_INFO_BUFFER_LENGTH = 81;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaOtaProvisionStatus.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaOtaProvisionStatus.aidl
deleted file mode 100644
index ae35fba..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaOtaProvisionStatus.aidl
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum CdmaOtaProvisionStatus {
-  SPL_UNLOCKED,
-  SPC_RETRIES_EXCEEDED,
-  A_KEY_EXCHANGED,
-  SSD_UPDATED,
-  NAM_DOWNLOADED,
-  MDN_DOWNLOADED,
-  IMSI_DOWNLOADED,
-  PRL_DOWNLOADED,
-  COMMITTED,
-  OTAPA_STARTED,
-  OTAPA_STOPPED,
-  OTAPA_ABORTED,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaRedirectingNumberInfoRecord.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaRedirectingNumberInfoRecord.aidl
deleted file mode 100644
index 818d107..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaRedirectingNumberInfoRecord.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-parcelable CdmaRedirectingNumberInfoRecord {
-  android.hardware.radio.voice.CdmaNumberInfoRecord redirectingNumber;
-  int redirectingReason;
-  const int REDIRECTING_REASON_UNKNOWN = 0;
-  const int REDIRECTING_REASON_CALL_FORWARDING_BUSY = 1;
-  const int REDIRECTING_REASON_CALL_FORWARDING_NO_REPLY = 2;
-  const int REDIRECTING_REASON_CALLED_DTE_OUT_OF_ORDER = 9;
-  const int REDIRECTING_REASON_CALL_FORWARDING_BY_THE_CALLED_DTE = 10;
-  const int REDIRECTING_REASON_CALL_FORWARDING_UNCONDITIONAL = 15;
-  const int REDIRECTING_REASON_RESERVED = 16;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaSignalInfoRecord.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaSignalInfoRecord.aidl
deleted file mode 100644
index 69447b4..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaSignalInfoRecord.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CdmaSignalInfoRecord {
-  boolean isPresent;
-  byte signalType;
-  byte alertPitch;
-  byte signal;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaT53AudioControlInfoRecord.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaT53AudioControlInfoRecord.aidl
deleted file mode 100644
index 69d79aa..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaT53AudioControlInfoRecord.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CdmaT53AudioControlInfoRecord {
-  byte upLink;
-  byte downLink;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaT53ClirInfoRecord.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaT53ClirInfoRecord.aidl
deleted file mode 100644
index 83b6fb9..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CdmaT53ClirInfoRecord.aidl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CdmaT53ClirInfoRecord {
-  byte cause;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CfData.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CfData.aidl
deleted file mode 100644
index fc811f2..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/CfData.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable CfData {
-  android.hardware.radio.voice.CallForwardInfo[] cfInfo;
-  const int NUM_SERVICE_CLASSES = 7;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/ClipStatus.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/ClipStatus.aidl
deleted file mode 100644
index 3153e0a..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/ClipStatus.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-enum ClipStatus {
-  CLIP_PROVISIONED,
-  CLIP_UNPROVISIONED,
-  UNKNOWN,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/Dial.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/Dial.aidl
deleted file mode 100644
index 26041f0..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/Dial.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable Dial {
-  String address;
-  int clir;
-  android.hardware.radio.voice.UusInfo[] uusInfo;
-  const int CLIR_DEFAULT = 0;
-  const int CLIR_INVOCATION = 1;
-  const int CLIR_SUPPRESSION = 2;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/EmergencyCallRouting.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/EmergencyCallRouting.aidl
deleted file mode 100644
index a45f388..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/EmergencyCallRouting.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-enum EmergencyCallRouting {
-  UNKNOWN,
-  EMERGENCY,
-  NORMAL,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/EmergencyNumber.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/EmergencyNumber.aidl
deleted file mode 100644
index 2129f39..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/EmergencyNumber.aidl
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable EmergencyNumber {
-  String number;
-  String mcc;
-  String mnc;
-  int categories;
-  String[] urns;
-  int sources;
-  const int SOURCE_NETWORK_SIGNALING = (1 << 0) /* 1 */;
-  const int SOURCE_SIM = (1 << 1) /* 2 */;
-  const int SOURCE_MODEM_CONFIG = (1 << 2) /* 4 */;
-  const int SOURCE_DEFAULT = (1 << 3) /* 8 */;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/EmergencyServiceCategory.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/EmergencyServiceCategory.aidl
deleted file mode 100644
index 819baf8..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/EmergencyServiceCategory.aidl
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum EmergencyServiceCategory {
-  UNSPECIFIED = 0,
-  POLICE = (1 << 0) /* 1 */,
-  AMBULANCE = (1 << 1) /* 2 */,
-  FIRE_BRIGADE = (1 << 2) /* 4 */,
-  MARINE_GUARD = (1 << 3) /* 8 */,
-  MOUNTAIN_RESCUE = (1 << 4) /* 16 */,
-  MIEC = (1 << 5) /* 32 */,
-  AIEC = (1 << 6) /* 64 */,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/IRadioVoice.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/IRadioVoice.aidl
deleted file mode 100644
index d0a9451..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/IRadioVoice.aidl
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@VintfStability
-interface IRadioVoice {
-  oneway void acceptCall(in int serial);
-  oneway void cancelPendingUssd(in int serial);
-  oneway void conference(in int serial);
-  oneway void dial(in int serial, in android.hardware.radio.voice.Dial dialInfo);
-  oneway void emergencyDial(in int serial, in android.hardware.radio.voice.Dial dialInfo, in int categories, in String[] urns, in android.hardware.radio.voice.EmergencyCallRouting routing, in boolean hasKnownUserIntentEmergency, in boolean isTesting);
-  oneway void exitEmergencyCallbackMode(in int serial);
-  oneway void explicitCallTransfer(in int serial);
-  oneway void getCallForwardStatus(in int serial, in android.hardware.radio.voice.CallForwardInfo callInfo);
-  oneway void getCallWaiting(in int serial, in int serviceClass);
-  oneway void getClip(in int serial);
-  oneway void getClir(in int serial);
-  oneway void getCurrentCalls(in int serial);
-  oneway void getLastCallFailCause(in int serial);
-  oneway void getMute(in int serial);
-  oneway void getPreferredVoicePrivacy(in int serial);
-  oneway void getTtyMode(in int serial);
-  oneway void handleStkCallSetupRequestFromSim(in int serial, in boolean accept);
-  oneway void hangup(in int serial, in int gsmIndex);
-  oneway void hangupForegroundResumeBackground(in int serial);
-  oneway void hangupWaitingOrBackground(in int serial);
-  oneway void isVoNrEnabled(in int serial);
-  oneway void rejectCall(in int serial);
-  oneway void responseAcknowledgement();
-  oneway void sendBurstDtmf(in int serial, in String dtmf, in int on, in int off);
-  oneway void sendCdmaFeatureCode(in int serial, in String featureCode);
-  oneway void sendDtmf(in int serial, in String s);
-  oneway void sendUssd(in int serial, in String ussd);
-  oneway void separateConnection(in int serial, in int gsmIndex);
-  oneway void setCallForward(in int serial, in android.hardware.radio.voice.CallForwardInfo callInfo);
-  oneway void setCallWaiting(in int serial, in boolean enable, in int serviceClass);
-  oneway void setClir(in int serial, in int status);
-  oneway void setMute(in int serial, in boolean enable);
-  oneway void setPreferredVoicePrivacy(in int serial, in boolean enable);
-  oneway void setResponseFunctions(in android.hardware.radio.voice.IRadioVoiceResponse radioVoiceResponse, in android.hardware.radio.voice.IRadioVoiceIndication radioVoiceIndication);
-  oneway void setTtyMode(in int serial, in android.hardware.radio.voice.TtyMode mode);
-  oneway void setVoNrEnabled(in int serial, in boolean enable);
-  oneway void startDtmf(in int serial, in String s);
-  oneway void stopDtmf(in int serial);
-  oneway void switchWaitingOrHoldingAndActive(in int serial);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/IRadioVoiceIndication.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/IRadioVoiceIndication.aidl
deleted file mode 100644
index 4614ee1..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/IRadioVoiceIndication.aidl
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@VintfStability
-interface IRadioVoiceIndication {
-  oneway void callRing(in android.hardware.radio.RadioIndicationType type, in boolean isGsm, in android.hardware.radio.voice.CdmaSignalInfoRecord record);
-  oneway void callStateChanged(in android.hardware.radio.RadioIndicationType type);
-  oneway void cdmaCallWaiting(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.voice.CdmaCallWaiting callWaitingRecord);
-  oneway void cdmaInfoRec(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.voice.CdmaInformationRecord[] records);
-  oneway void cdmaOtaProvisionStatus(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.voice.CdmaOtaProvisionStatus status);
-  oneway void currentEmergencyNumberList(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.voice.EmergencyNumber[] emergencyNumberList);
-  oneway void enterEmergencyCallbackMode(in android.hardware.radio.RadioIndicationType type);
-  oneway void exitEmergencyCallbackMode(in android.hardware.radio.RadioIndicationType type);
-  oneway void indicateRingbackTone(in android.hardware.radio.RadioIndicationType type, in boolean start);
-  oneway void onSupplementaryServiceIndication(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.voice.StkCcUnsolSsResult ss);
-  oneway void onUssd(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.voice.UssdModeType modeType, in String msg);
-  oneway void resendIncallMute(in android.hardware.radio.RadioIndicationType type);
-  oneway void srvccStateNotify(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.voice.SrvccState state);
-  oneway void stkCallControlAlphaNotify(in android.hardware.radio.RadioIndicationType type, in String alpha);
-  oneway void stkCallSetup(in android.hardware.radio.RadioIndicationType type, in long timeout);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/IRadioVoiceResponse.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/IRadioVoiceResponse.aidl
deleted file mode 100644
index 46927c2..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/IRadioVoiceResponse.aidl
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@VintfStability
-interface IRadioVoiceResponse {
-  oneway void acceptCallResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void acknowledgeRequest(in int serial);
-  oneway void cancelPendingUssdResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void conferenceResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void dialResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void emergencyDialResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void exitEmergencyCallbackModeResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void explicitCallTransferResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void getCallForwardStatusResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.voice.CallForwardInfo[] callForwardInfos);
-  oneway void getCallWaitingResponse(in android.hardware.radio.RadioResponseInfo info, in boolean enable, in int serviceClass);
-  oneway void getClipResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.voice.ClipStatus status);
-  oneway void getClirResponse(in android.hardware.radio.RadioResponseInfo info, in int n, in int m);
-  oneway void getCurrentCallsResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.voice.Call[] calls);
-  oneway void getLastCallFailCauseResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.voice.LastCallFailCauseInfo failCauseinfo);
-  oneway void getMuteResponse(in android.hardware.radio.RadioResponseInfo info, in boolean enable);
-  oneway void getPreferredVoicePrivacyResponse(in android.hardware.radio.RadioResponseInfo info, in boolean enable);
-  oneway void getTtyModeResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.voice.TtyMode mode);
-  oneway void handleStkCallSetupRequestFromSimResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void hangupConnectionResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void hangupForegroundResumeBackgroundResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void hangupWaitingOrBackgroundResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void isVoNrEnabledResponse(in android.hardware.radio.RadioResponseInfo info, in boolean enable);
-  oneway void rejectCallResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void sendBurstDtmfResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void sendCdmaFeatureCodeResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void sendDtmfResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void sendUssdResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void separateConnectionResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setCallForwardResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setCallWaitingResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setClirResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setMuteResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setPreferredVoicePrivacyResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setTtyModeResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void setVoNrEnabledResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void startDtmfResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void stopDtmfResponse(in android.hardware.radio.RadioResponseInfo info);
-  oneway void switchWaitingOrHoldingAndActiveResponse(in android.hardware.radio.RadioResponseInfo info);
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/LastCallFailCause.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/LastCallFailCause.aidl
deleted file mode 100644
index 17a039f..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/LastCallFailCause.aidl
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-enum LastCallFailCause {
-  INVALID = 0,
-  UNOBTAINABLE_NUMBER = 1,
-  NO_ROUTE_TO_DESTINATION = 3,
-  CHANNEL_UNACCEPTABLE = 6,
-  OPERATOR_DETERMINED_BARRING = 8,
-  NORMAL = 16,
-  BUSY = 17,
-  NO_USER_RESPONDING = 18,
-  NO_ANSWER_FROM_USER = 19,
-  CALL_REJECTED = 21,
-  NUMBER_CHANGED = 22,
-  PREEMPTION = 25,
-  DESTINATION_OUT_OF_ORDER = 27,
-  INVALID_NUMBER_FORMAT = 28,
-  FACILITY_REJECTED = 29,
-  RESP_TO_STATUS_ENQUIRY = 30,
-  NORMAL_UNSPECIFIED = 31,
-  CONGESTION = 34,
-  NETWORK_OUT_OF_ORDER = 38,
-  TEMPORARY_FAILURE = 41,
-  SWITCHING_EQUIPMENT_CONGESTION = 42,
-  ACCESS_INFORMATION_DISCARDED = 43,
-  REQUESTED_CIRCUIT_OR_CHANNEL_NOT_AVAILABLE = 44,
-  RESOURCES_UNAVAILABLE_OR_UNSPECIFIED = 47,
-  QOS_UNAVAILABLE = 49,
-  REQUESTED_FACILITY_NOT_SUBSCRIBED = 50,
-  INCOMING_CALLS_BARRED_WITHIN_CUG = 55,
-  BEARER_CAPABILITY_NOT_AUTHORIZED = 57,
-  BEARER_CAPABILITY_UNAVAILABLE = 58,
-  SERVICE_OPTION_NOT_AVAILABLE = 63,
-  BEARER_SERVICE_NOT_IMPLEMENTED = 65,
-  ACM_LIMIT_EXCEEDED = 68,
-  REQUESTED_FACILITY_NOT_IMPLEMENTED = 69,
-  ONLY_DIGITAL_INFORMATION_BEARER_AVAILABLE = 70,
-  SERVICE_OR_OPTION_NOT_IMPLEMENTED = 79,
-  INVALID_TRANSACTION_IDENTIFIER = 81,
-  USER_NOT_MEMBER_OF_CUG = 87,
-  INCOMPATIBLE_DESTINATION = 88,
-  INVALID_TRANSIT_NW_SELECTION = 91,
-  SEMANTICALLY_INCORRECT_MESSAGE = 95,
-  INVALID_MANDATORY_INFORMATION = 96,
-  MESSAGE_TYPE_NON_IMPLEMENTED = 97,
-  MESSAGE_TYPE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE = 98,
-  INFORMATION_ELEMENT_NON_EXISTENT = 99,
-  CONDITIONAL_IE_ERROR = 100,
-  MESSAGE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE = 101,
-  RECOVERY_ON_TIMER_EXPIRED = 102,
-  PROTOCOL_ERROR_UNSPECIFIED = 111,
-  INTERWORKING_UNSPECIFIED = 127,
-  CALL_BARRED = 240,
-  FDN_BLOCKED = 241,
-  IMSI_UNKNOWN_IN_VLR = 242,
-  IMEI_NOT_ACCEPTED = 243,
-  DIAL_MODIFIED_TO_USSD = 244,
-  DIAL_MODIFIED_TO_SS = 245,
-  DIAL_MODIFIED_TO_DIAL = 246,
-  RADIO_OFF = 247,
-  OUT_OF_SERVICE = 248,
-  NO_VALID_SIM = 249,
-  RADIO_INTERNAL_ERROR = 250,
-  NETWORK_RESP_TIMEOUT = 251,
-  NETWORK_REJECT = 252,
-  RADIO_ACCESS_FAILURE = 253,
-  RADIO_LINK_FAILURE = 254,
-  RADIO_LINK_LOST = 255,
-  RADIO_UPLINK_FAILURE = 256,
-  RADIO_SETUP_FAILURE = 257,
-  RADIO_RELEASE_NORMAL = 258,
-  RADIO_RELEASE_ABNORMAL = 259,
-  ACCESS_CLASS_BLOCKED = 260,
-  NETWORK_DETACH = 261,
-  CDMA_LOCKED_UNTIL_POWER_CYCLE = 1000,
-  CDMA_DROP = 1001,
-  CDMA_INTERCEPT = 1002,
-  CDMA_REORDER = 1003,
-  CDMA_SO_REJECT = 1004,
-  CDMA_RETRY_ORDER = 1005,
-  CDMA_ACCESS_FAILURE = 1006,
-  CDMA_PREEMPTED = 1007,
-  CDMA_NOT_EMERGENCY = 1008,
-  CDMA_ACCESS_BLOCKED = 1009,
-  OEM_CAUSE_1 = 0xf001,
-  OEM_CAUSE_2 = 0xf002,
-  OEM_CAUSE_3 = 0xf003,
-  OEM_CAUSE_4 = 0xf004,
-  OEM_CAUSE_5 = 0xf005,
-  OEM_CAUSE_6 = 0xf006,
-  OEM_CAUSE_7 = 0xf007,
-  OEM_CAUSE_8 = 0xf008,
-  OEM_CAUSE_9 = 0xf009,
-  OEM_CAUSE_10 = 0xf00a,
-  OEM_CAUSE_11 = 0xf00b,
-  OEM_CAUSE_12 = 0xf00c,
-  OEM_CAUSE_13 = 0xf00d,
-  OEM_CAUSE_14 = 0xf00e,
-  OEM_CAUSE_15 = 0xf00f,
-  ERROR_UNSPECIFIED = 0xffff,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/LastCallFailCauseInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/LastCallFailCauseInfo.aidl
deleted file mode 100644
index c36a934..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/LastCallFailCauseInfo.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable LastCallFailCauseInfo {
-  android.hardware.radio.voice.LastCallFailCause causeCode = android.hardware.radio.voice.LastCallFailCause.INVALID;
-  String vendorCause;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/SrvccState.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/SrvccState.aidl
deleted file mode 100644
index 981ba02..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/SrvccState.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum SrvccState {
-  HANDOVER_STARTED,
-  HANDOVER_COMPLETED,
-  HANDOVER_FAILED,
-  HANDOVER_CANCELED,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/SsInfoData.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/SsInfoData.aidl
deleted file mode 100644
index 2af38fe..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/SsInfoData.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-parcelable SsInfoData {
-  int[] ssInfo;
-  const int SS_INFO_MAX = 4;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/StkCcUnsolSsResult.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/StkCcUnsolSsResult.aidl
deleted file mode 100644
index d265374..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/StkCcUnsolSsResult.aidl
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable StkCcUnsolSsResult {
-  int serviceType;
-  int requestType;
-  int teleserviceType;
-  int serviceClass;
-  android.hardware.radio.RadioError result = android.hardware.radio.RadioError.NONE;
-  android.hardware.radio.voice.SsInfoData[] ssInfo;
-  android.hardware.radio.voice.CfData[] cfData;
-  const int REQUEST_TYPE_ACTIVATION = 0;
-  const int REQUEST_TYPE_DEACTIVATION = 1;
-  const int REQUEST_TYPE_INTERROGATION = 2;
-  const int REQUEST_TYPE_REGISTRATION = 3;
-  const int REQUEST_TYPE_ERASURE = 4;
-  const int SERVICE_TYPE_CFU = 0;
-  const int SERVICE_TYPE_CF_BUSY = 1;
-  const int SERVICE_TYPE_CF_NO_REPLY = 2;
-  const int SERVICE_TYPE_CF_NOT_REACHABLE = 3;
-  const int SERVICE_TYPE_CF_ALL = 4;
-  const int SERVICE_TYPE_CF_ALL_CONDITIONAL = 5;
-  const int SERVICE_TYPE_CLIP = 6;
-  const int SERVICE_TYPE_CLIR = 7;
-  const int SERVICE_TYPE_COLP = 8;
-  const int SERVICE_TYPE_COLR = 9;
-  const int SERVICE_TYPE_WAIT = 10;
-  const int SERVICE_TYPE_BAOC = 11;
-  const int SERVICE_TYPE_BAOIC = 12;
-  const int SERVICE_TYPE_BAOIC_EXC_HOME = 13;
-  const int SERVICE_TYPE_BAIC = 14;
-  const int SERVICE_TYPE_BAIC_ROAMING = 15;
-  const int SERVICE_TYPE_ALL_BARRING = 16;
-  const int SERVICE_TYPE_OUTGOING_BARRING = 17;
-  const int SERVICE_TYPE_INCOMING_BARRING = 18;
-  const int TELESERVICE_TYPE_ALL_TELE_AND_BEARER_SERVICES = 0;
-  const int TELESERVICE_TYPE_ALL_TELESEVICES = 1;
-  const int TELESERVICE_TYPE_TELEPHONY = 2;
-  const int TELESERVICE_TYPE_ALL_DATA_TELESERVICES = 3;
-  const int TELESERVICE_TYPE_SMS_SERVICES = 4;
-  const int TELESERVICE_TYPE_ALL_TELESERVICES_EXCEPT_SMS = 5;
-  const int SUPP_SERVICE_CLASS_NONE = 0;
-  const int SUPP_SERVICE_CLASS_VOICE = (1 << 0) /* 1 */;
-  const int SUPP_SERVICE_CLASS_DATA = (1 << 1) /* 2 */;
-  const int SUPP_SERVICE_CLASS_FAX = (1 << 2) /* 4 */;
-  const int SUPP_SERVICE_CLASS_SMS = (1 << 3) /* 8 */;
-  const int SUPP_SERVICE_CLASS_DATA_SYNC = (1 << 4) /* 16 */;
-  const int SUPP_SERVICE_CLASS_DATA_ASYNC = (1 << 5) /* 32 */;
-  const int SUPP_SERVICE_CLASS_PACKET = (1 << 6) /* 64 */;
-  const int SUPP_SERVICE_CLASS_PAD = (1 << 7) /* 128 */;
-  const int SUPP_SERVICE_CLASS_MAX = (1 << 7) /* 128 */;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/TtyMode.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/TtyMode.aidl
deleted file mode 100644
index 41ff6b8..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/TtyMode.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum TtyMode {
-  OFF,
-  FULL,
-  HCO,
-  VCO,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/UssdModeType.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/UssdModeType.aidl
deleted file mode 100644
index 9e80f03..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/UssdModeType.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum UssdModeType {
-  NOTIFY,
-  REQUEST,
-  NW_RELEASE,
-  LOCAL_CLIENT,
-  NOT_SUPPORTED,
-  NW_TIMEOUT,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/UusInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/UusInfo.aidl
deleted file mode 100644
index 79c77ee..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio.voice/4/android/hardware/radio/voice/UusInfo.aidl
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio.voice;
-/* @hide */
-@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-parcelable UusInfo {
-  int uusType;
-  int uusDcs;
-  String uusData;
-  const int UUS_DCS_USP = 0;
-  const int UUS_DCS_OSIHLP = 1;
-  const int UUS_DCS_X244 = 2;
-  const int UUS_DCS_RMCF = 3;
-  const int UUS_DCS_IA5C = 4;
-  const int UUS_TYPE_TYPE1_IMPLICIT = 0;
-  const int UUS_TYPE_TYPE1_REQUIRED = 1;
-  const int UUS_TYPE_TYPE1_NOT_REQUIRED = 2;
-  const int UUS_TYPE_TYPE2_REQUIRED = 3;
-  const int UUS_TYPE_TYPE2_NOT_REQUIRED = 4;
-  const int UUS_TYPE_TYPE3_REQUIRED = 5;
-  const int UUS_TYPE_TYPE3_NOT_REQUIRED = 6;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio/4/.hash b/radio/aidl/aidl_api/android.hardware.radio/4/.hash
deleted file mode 100644
index d1ed44a..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio/4/.hash
+++ /dev/null
@@ -1 +0,0 @@
-0ac4a4cc62d8348b7d0b29507947ac34fd5aa520
diff --git a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/AccessNetwork.aidl b/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/AccessNetwork.aidl
deleted file mode 100644
index 73a267b..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/AccessNetwork.aidl
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum AccessNetwork {
-  UNKNOWN,
-  GERAN,
-  UTRAN,
-  EUTRAN,
-  CDMA2000,
-  IWLAN,
-  NGRAN,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioAccessFamily.aidl b/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioAccessFamily.aidl
deleted file mode 100644
index 1298ab0..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioAccessFamily.aidl
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum RadioAccessFamily {
-  UNKNOWN = (1 << android.hardware.radio.RadioTechnology.UNKNOWN) /* 1 */,
-  GPRS = (1 << android.hardware.radio.RadioTechnology.GPRS) /* 2 */,
-  EDGE = (1 << android.hardware.radio.RadioTechnology.EDGE) /* 4 */,
-  UMTS = (1 << android.hardware.radio.RadioTechnology.UMTS) /* 8 */,
-  IS95A = (1 << android.hardware.radio.RadioTechnology.IS95A) /* 16 */,
-  IS95B = (1 << android.hardware.radio.RadioTechnology.IS95B) /* 32 */,
-  ONE_X_RTT = (1 << android.hardware.radio.RadioTechnology.ONE_X_RTT) /* 64 */,
-  EVDO_0 = (1 << android.hardware.radio.RadioTechnology.EVDO_0) /* 128 */,
-  EVDO_A = (1 << android.hardware.radio.RadioTechnology.EVDO_A) /* 256 */,
-  HSDPA = (1 << android.hardware.radio.RadioTechnology.HSDPA) /* 512 */,
-  HSUPA = (1 << android.hardware.radio.RadioTechnology.HSUPA) /* 1024 */,
-  HSPA = (1 << android.hardware.radio.RadioTechnology.HSPA) /* 2048 */,
-  EVDO_B = (1 << android.hardware.radio.RadioTechnology.EVDO_B) /* 4096 */,
-  EHRPD = (1 << android.hardware.radio.RadioTechnology.EHRPD) /* 8192 */,
-  LTE = (1 << android.hardware.radio.RadioTechnology.LTE) /* 16384 */,
-  HSPAP = (1 << android.hardware.radio.RadioTechnology.HSPAP) /* 32768 */,
-  GSM = (1 << android.hardware.radio.RadioTechnology.GSM) /* 65536 */,
-  TD_SCDMA = (1 << android.hardware.radio.RadioTechnology.TD_SCDMA) /* 131072 */,
-  IWLAN = (1 << android.hardware.radio.RadioTechnology.IWLAN) /* 262144 */,
-  /**
-   * @deprecated use LTE instead.
-   */
-  LTE_CA = (1 << android.hardware.radio.RadioTechnology.LTE_CA) /* 524288 */,
-  NR = (1 << android.hardware.radio.RadioTechnology.NR) /* 1048576 */,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioConst.aidl b/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioConst.aidl
deleted file mode 100644
index e24a35d..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioConst.aidl
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable RadioConst {
-  const int VALUE_UNAVAILABLE = 0x7FFFFFFF;
-  const long VALUE_UNAVAILABLE_LONG = 0x7FFFFFFFFFFFFFFF;
-  const byte VALUE_UNAVAILABLE_BYTE = 0xFFu8;
-  const int MAX_RILDS = 3;
-  const int MAX_UUID_LENGTH = 64;
-  const int CARD_MAX_APPS = 8;
-  const int P2_CONSTANT_NO_P2 = (-1) /* -1 */;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioError.aidl b/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioError.aidl
deleted file mode 100644
index e782e73..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioError.aidl
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
-enum RadioError {
-  NONE = 0,
-  RADIO_NOT_AVAILABLE = 1,
-  GENERIC_FAILURE = 2,
-  PASSWORD_INCORRECT = 3,
-  SIM_PIN2 = 4,
-  SIM_PUK2 = 5,
-  REQUEST_NOT_SUPPORTED = 6,
-  CANCELLED = 7,
-  OP_NOT_ALLOWED_DURING_VOICE_CALL = 8,
-  OP_NOT_ALLOWED_BEFORE_REG_TO_NW = 9,
-  SMS_SEND_FAIL_RETRY = 10,
-  SIM_ABSENT = 11,
-  SUBSCRIPTION_NOT_AVAILABLE = 12,
-  MODE_NOT_SUPPORTED = 13,
-  FDN_CHECK_FAILURE = 14,
-  ILLEGAL_SIM_OR_ME = 15,
-  MISSING_RESOURCE = 16,
-  NO_SUCH_ELEMENT = 17,
-  DIAL_MODIFIED_TO_USSD = 18,
-  DIAL_MODIFIED_TO_SS = 19,
-  DIAL_MODIFIED_TO_DIAL = 20,
-  USSD_MODIFIED_TO_DIAL = 21,
-  USSD_MODIFIED_TO_SS = 22,
-  USSD_MODIFIED_TO_USSD = 23,
-  SS_MODIFIED_TO_DIAL = 24,
-  SS_MODIFIED_TO_USSD = 25,
-  SUBSCRIPTION_NOT_SUPPORTED = 26,
-  SS_MODIFIED_TO_SS = 27,
-  LCE_NOT_SUPPORTED = 36,
-  NO_MEMORY = 37,
-  INTERNAL_ERR = 38,
-  SYSTEM_ERR = 39,
-  MODEM_ERR = 40,
-  INVALID_STATE = 41,
-  NO_RESOURCES = 42,
-  SIM_ERR = 43,
-  INVALID_ARGUMENTS = 44,
-  INVALID_SIM_STATE = 45,
-  INVALID_MODEM_STATE = 46,
-  INVALID_CALL_ID = 47,
-  NO_SMS_TO_ACK = 48,
-  NETWORK_ERR = 49,
-  REQUEST_RATE_LIMITED = 50,
-  SIM_BUSY = 51,
-  SIM_FULL = 52,
-  NETWORK_REJECT = 53,
-  OPERATION_NOT_ALLOWED = 54,
-  EMPTY_RECORD = 55,
-  INVALID_SMS_FORMAT = 56,
-  ENCODING_ERR = 57,
-  INVALID_SMSC_ADDRESS = 58,
-  NO_SUCH_ENTRY = 59,
-  NETWORK_NOT_READY = 60,
-  NOT_PROVISIONED = 61,
-  NO_SUBSCRIPTION = 62,
-  NO_NETWORK_FOUND = 63,
-  DEVICE_IN_USE = 64,
-  ABORTED = 65,
-  INVALID_RESPONSE = 66,
-  OEM_ERROR_1 = 501,
-  OEM_ERROR_2 = 502,
-  OEM_ERROR_3 = 503,
-  OEM_ERROR_4 = 504,
-  OEM_ERROR_5 = 505,
-  OEM_ERROR_6 = 506,
-  OEM_ERROR_7 = 507,
-  OEM_ERROR_8 = 508,
-  OEM_ERROR_9 = 509,
-  OEM_ERROR_10 = 510,
-  OEM_ERROR_11 = 511,
-  OEM_ERROR_12 = 512,
-  OEM_ERROR_13 = 513,
-  OEM_ERROR_14 = 514,
-  OEM_ERROR_15 = 515,
-  OEM_ERROR_16 = 516,
-  OEM_ERROR_17 = 517,
-  OEM_ERROR_18 = 518,
-  OEM_ERROR_19 = 519,
-  OEM_ERROR_20 = 520,
-  OEM_ERROR_21 = 521,
-  OEM_ERROR_22 = 522,
-  OEM_ERROR_23 = 523,
-  OEM_ERROR_24 = 524,
-  OEM_ERROR_25 = 525,
-  SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED = 67,
-  ACCESS_BARRED = 68,
-  BLOCKED_DUE_TO_CALL = 69,
-  RF_HARDWARE_ISSUE = 70,
-  NO_RF_CALIBRATION_INFO = 71,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioIndicationType.aidl b/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioIndicationType.aidl
deleted file mode 100644
index 316f92f..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioIndicationType.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum RadioIndicationType {
-  UNSOLICITED,
-  UNSOLICITED_ACK_EXP,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioResponseInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioResponseInfo.aidl
deleted file mode 100644
index bfab0c5..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioResponseInfo.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable RadioResponseInfo {
-  android.hardware.radio.RadioResponseType type = android.hardware.radio.RadioResponseType.SOLICITED;
-  int serial;
-  android.hardware.radio.RadioError error = android.hardware.radio.RadioError.NONE;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioResponseInfoModem.aidl b/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioResponseInfoModem.aidl
deleted file mode 100644
index c445fec..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioResponseInfoModem.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio;
-/* @hide */
-@JavaDerive(toString=true) @VintfStability
-parcelable RadioResponseInfoModem {
-  android.hardware.radio.RadioResponseType type = android.hardware.radio.RadioResponseType.SOLICITED;
-  int serial;
-  android.hardware.radio.RadioError error = android.hardware.radio.RadioError.NONE;
-  boolean isEnabled;
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioResponseType.aidl b/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioResponseType.aidl
deleted file mode 100644
index 8bdb45b..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioResponseType.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum RadioResponseType {
-  SOLICITED,
-  SOLICITED_ACK,
-  SOLICITED_ACK_EXP,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioTechnology.aidl b/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioTechnology.aidl
deleted file mode 100644
index 7c6a657..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioTechnology.aidl
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum RadioTechnology {
-  UNKNOWN,
-  GPRS,
-  EDGE,
-  UMTS,
-  IS95A,
-  IS95B,
-  ONE_X_RTT,
-  EVDO_0,
-  EVDO_A,
-  HSDPA,
-  HSUPA,
-  HSPA,
-  EVDO_B,
-  EHRPD,
-  LTE,
-  HSPAP,
-  GSM,
-  TD_SCDMA,
-  IWLAN,
-  /**
-   * @deprecated use LTE instead and indicate carrier aggregation through multiple physical channel configurations in IRadioNetwork::currentPhysicalChannelConfigs.
-   */
-  LTE_CA,
-  NR,
-}
diff --git a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioTechnologyFamily.aidl b/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioTechnologyFamily.aidl
deleted file mode 100644
index 85e9850..0000000
--- a/radio/aidl/aidl_api/android.hardware.radio/4/android/hardware/radio/RadioTechnologyFamily.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package android.hardware.radio;
-/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
-enum RadioTechnologyFamily {
-  THREE_GPP,
-  THREE_GPP2,
-}