[gbinder-radio] Add support for IRadio@1.6. JB#63650

[gbinder-radio] Add support for IRadioConfig@1.3. JB#63650
Merge pull request #29 from monich/fix_loop
2025-08-24 22:17:12 +03:00 · 2025-08-24 19:16:02 +03:00 · 2024-10-28 18:18:05 +02:00 · 2024-10-28 02:29:51 +02:00
22 changed files with 532 additions and 294 deletions
--- a/2
+++ b/2
@@ -238,7 +238,7 @@ INSTALL_PKGCONFIG_DIR = $(DESTDIR)$(ABS_LIBDIR)/pkgconfig
 install: $(INSTALL_LIB_DIR)
 	$(INSTALL) -m 755 $(RELEASE_SO) $(INSTALL_LIB_DIR)
 	ln -sf $(LIB_SO) $(INSTALL_LIB_DIR)/$(LIB_SYMLINK2)
-	ln -sf $(LIB_SO) $(INSTALL_LIB_DIR)/$(LIB_SYMLINK1)
+	ln -sf $(LIB_SYMLINK2) $(INSTALL_LIB_DIR)/$(LIB_SYMLINK1)

 install-dev: install $(INSTALL_INCLUDE_DIR) $(INSTALL_PKGCONFIG_DIR)
 	$(INSTALL_FILES) $(INCLUDE_DIR)/*.h $(INSTALL_INCLUDE_DIR)
--- a/debian/Jenkinsfile
+++ b/debian/Jenkinsfile
@@ -1,10 +0,0 @@
-@Library('ubports-build-tools') _
-
-buildAndProvideDebianPackage()
-
-// Or if the package consists entirely of arch-independent packages:
-// (optional optimization, will confuse BlueOcean's live view at build stage)
-// buildAndProvideDebianPackage(/* isArchIndependent */ true)
-
-// Optionally, to skip building on some architectures (amd64 is always built):
-// buildAndProvideDebianPackage(false, /* ignoredArchs */ ['arm64'])
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,49 +1,202 @@
-libgbinder-radio (1.6.0-0ubports1) UNRELEASED; urgency=unknown
+libgbinder-radio (1.6.0) unstable; urgency=medium

-  * New upstream release v1.6.0 
+  * Implement support for AIDL IRadioIms
+  * Implement support for AIDL IRadioVoice
+  * Implement support for AIDL IRadioMessaging
+  * Implement support for AIDL IRadioData
+  * Implement support for AIDL IRadioNetwork
+  * Implement support for AIDL IRadioSim
+  * Implement support for AIDL IRadioModem
+  * Implement support for AIDL IRadioConfig

- -- UBports package upgrader bot <dev@ubports.com>  Fri, 13 Dec 2024 04:07:25 +0000
+ -- Matti Lehtimäki <matti.lehtimaki@jolla.com>  Thu, 26 Sep 2024 14:03:30 +0300

-libgbinder-radio (1.5.6-0ubports1) UNRELEASED; urgency=unknown
+libgbinder-radio (1.5.6) unstable; urgency=medium

-  * New upstream release v1.5.6 
+  * Fix version in Makefile

- -- UBports package upgrader bot <dev@ubports.com>  Thu, 09 Nov 2023 00:27:17 +0000
+ -- Matti Lehtimäki <matti.lehtimaki@jolla.com>  Fri, 21 Apr 2023 14:55:38 +0300

-libgbinder-radio (1.5.4-0ubports1) focal; urgency=medium
+libgbinder-radio (1.5.5) unstable; urgency=medium

-  * Update from upstream
+  * Fix RADIO_CELL_IDENTITY_TYPE_1_5 enum values
+  * Add missing radio indication filter enum values for IRadio@1.5 interface
+  * Add missing RadioAppStatus_1_5 struct

- -- Lionel Duboeuf <lduboeuf@ouvaton.org>  Wed, 08 Jan 2023 10:52:34 +0100
+ -- Matti Lehtimäki <matti.lehtimaki@jolla.com>  Fri, 14 Apr 2023 22:42:38 +0300

-libgbinder-radio (1.4.2-0ubports4) focal; urgency=medium
+libgbinder-radio (1.5.4) unstable; urgency=medium

-  * Rename libgbinder-radio-dev to libgbinder-radio1-dev
-  * Generate install files correctly again
+  * Added NR specific types

- -- Guido Berhoerster <guido+gitlab.com@berhoerster.name>  Wed, 24 Nov 2021 10:52:34 +0100
+ -- Slava Monich <slava.monich@jolla.com>  Wed, 30 Nov 2022 19:14:38 +0200

-libgbinder-radio (1.4.2-0ubports3) focal; urgency=medium
+libgbinder-radio (1.5.3) unstable; urgency=medium

-  * Switch to dh version 12
-  * Fix lintian warnings and errors
-    * Add fix-library-symlink.patch: fix symlink according to Debian policy
-    * Rename library package based on soname
-    * Add long description, improve short description
-    * Use static install files
-    * Add section to source package
-    * Specify homepage and VCS
+  * Added RADIO_ACCESS_NETWORKS enum

- -- Guido Berhoerster <guido+gitlab.com@berhoerster.name>  Mon, 15 Nov 2021 15:02:18 +0100
+ -- Slava Monich <slava.monich@jolla.com>  Sat, 19 Nov 2022 17:48:38 +0200

-libgbinder-radio (1.4.2-0ubports2) focal; urgency=medium
+libgbinder-radio (1.5.2) unstable; urgency=medium

-  * Bump version, no changes.
+  * Added network scan related types

- -- Guido Berhoerster <guido+gitlab.com@berhoerster.name>  Thu, 11 Nov 2021 15:02:07 +0100
+ -- Slava Monich <slava.monich@jolla.com>  Thu, 17 Nov 2022 03:12:02 +0200

-libgbinder-radio (1.4.2-0ubports1) focal; urgency=medium
+libgbinder-radio (1.5.1) unstable; urgency=medium

-  * Initial packaging for UBPorts
+  * Fixed names of IRadio 1.4 and 1.5 responses

- -- Guido Berhoerster <guido+gitlab.com@berhoerster.name>  Mon, 11 Oct 2021 16:38:02 +0200
+ -- Slava Monich <slava.monich@jolla.com>  Mon, 14 Nov 2022 22:34:08 +0200
+
+libgbinder-radio (1.5.0) unstable; urgency=medium
+
+  * Added support for IRadio@1.5
+  * Added support for IRadioConfig@1.2
+
+ -- Slava Monich <slava.monich@jolla.com>  Fri, 16 Sep 2022 14:13:04 +0300
+
+libgbinder-radio (1.4.12) unstable; urgency=medium
+
+  * Fixed RadioDataRegStateResult_1_4
+
+ -- Slava Monich <slava.monich@jolla.com>  Sun, 11 Sep 2022 21:37:23 +0300
+
+libgbinder-radio (1.4.11) unstable; urgency=medium
+
+  * Added radio_request_user_data()
+
+ -- Slava Monich <slava.monich@jolla.com>  Wed, 31 Aug 2022 19:10:49 +0300
+
+libgbinder-radio (1.4.10) unstable; urgency=medium
+
+  * Tweaked completion callback criteria
+
+ -- Slava Monich <slava.monich@jolla.com>  Fri, 15 Apr 2022 21:58:17 +0300
+
+libgbinder-radio (1.4.9) unstable; urgency=medium
+
+  * Added IMS types
+
+ -- Slava Monich <slava.monich@jolla.com>  Thu, 17 Feb 2022 01:47:27 +0200
+
+libgbinder-radio (1.4.8) unstable; urgency=medium
+
+  * Fixed retries of blocking requests
+
+ -- Slava Monich <slava.monich@jolla.com>  Wed, 19 Jan 2022 03:32:30 +0200
+
+libgbinder-radio (1.4.7) unstable; urgency=medium
+
+  * Fixed owner queue logic
+
+ -- Slava Monich <slava.monich@jolla.com>  Mon, 10 Jan 2022 01:03:28 +0200
+
+libgbinder-radio (1.4.6) unstable; urgency=medium
+
+  * Added RadioConfig API
+
+ -- Slava Monich <slava.monich@jolla.com>  Sat, 08 Jan 2022 20:58:06 +0200
+
+libgbinder-radio (1.4.5) unstable; urgency=medium
+
+  * Added radio_req_resp2()
+
+ -- Slava Monich <slava.monich@jolla.com>  Thu, 16 Dec 2021 01:18:54 +0200
+
+libgbinder-radio (1.4.4) unstable; urgency=medium
+
+  * Added IRadio@1.2 IndicationFilter bits
+
+ -- Slava Monich <slava.monich@jolla.com>  Tue, 14 Dec 2021 18:01:43 +0200
+
+libgbinder-radio (1.4.3) unstable; urgency=medium
+
+  * Added RadioClient and related APIs
+
+ -- Slava Monich <slava.monich@jolla.com>  Thu, 02 Dec 2021 19:08:47 +0200
+
+libgbinder-radio (1.4.2) unstable; urgency=medium
+
+  * Don't assume that GBinderServiceManager is a GObject
+  * Added unit tests
+
+ -- Slava Monich <slava.monich@jolla.com>  Sun, 12 Sep 2021 18:05:19 +0300
+
+libgbinder-radio (1.4.1) unstable; urgency=medium
+
+  * Added RADIO_CELL_INFO_TYPE_1_4 enum
+
+ -- Slava Monich <slava.monich@jolla.com>  Thu, 20 May 2021 16:32:16 +0300
+
+libgbinder-radio (1.4.0) unstable; urgency=medium
+
+  * Support for radio@1.4 interfaces
+  * Fixed RadioCellInfo_1_4 definition
+
+ -- Slava Monich <slava.monich@jolla.com>  Tue, 18 May 2021 18:54:52 +0300
+
+libgbinder-radio (1.2.6) unstable; urgency=medium
+
+  * Added RadioSimApdu type
+
+ -- Slava Monich <slava.monich@jolla.com>  Sun, 25 Apr 2021 14:41:32 +0300
+
+libgbinder-radio (1.2.5) unstable; urgency=medium
+
+  * Added radio@1.3 types
+  * Added radio@1.4 types
+
+ -- Slava Monich <slava.monich@jolla.com>  Thu, 25 Mar 2021 20:13:08 +0200
+
+libgbinder-radio (1.2.4) unstable; urgency=medium
+
+  * Added more radio@1.2 types
+
+ -- Slava Monich <slava.monich@jolla.com>  Sat, 20 Mar 2021 02:41:07 +0200
+
+libgbinder-radio (1.2.3) unstable; urgency=medium
+
+  * Reformatted radio@1.2 types
+
+ -- Slava Monich <slava.monich@jolla.com>  Fri, 19 Mar 2021 05:21:52 +0200
+
+libgbinder-radio (1.2.2) unstable; urgency=medium
+
+  * Added radio_instance_get_with_version()
+
+ -- Slava Monich <slava.monich@jolla.com>  Fri, 05 Mar 2021 14:00:20 +0200
+
+libgbinder-radio (1.2.1) unstable; urgency=medium
+
+  * Fixed backward compatibility with radio@1.0
+
+ -- Slava Monich <slava.monich@jolla.com>  Fri, 05 Mar 2021 12:33:50 +0200
+
+libgbinder-radio (1.2.0) unstable; urgency=medium
+
+  * Support for radio@1.2 interfaces
+
+ -- Slava Monich <slava.monich@jolla.com>  Thu, 04 Mar 2021 13:36:51 +0200
+
+libgbinder-radio (1.0.11) unstable; urgency=medium
+
+  * Make library executable on RPM based systems
+  * Added req => resp mapping for radio@1.1 calls
+
+ -- Slava Monich <slava.monich@jolla.com>  Thu, 01 Oct 2020 21:04:59 +0300
+
+libgbinder-radio (1.0.10) unstable; urgency=medium
+
+  * Hide internal symbols
+  * Respect arch specific lib dir
+  * Ignore GLib deprecation warnings
+  * Added constants for android.hardware.radio@1.1 interfaces
+
+ -- Slava Monich <slava.monich@jolla.com>  Wed, 03 Jun 2020 15:24:17 +0300
+
+libgbinder-radio (1.0.9) unstable; urgency=medium
+
+  * Added packaging for Debian-based distros.
+
+ -- Danct12 <danct12@disroot.org>  Tue, 24 Mar 2020 02:55:50 +0700
--- a/debian/compat
+++ b/debian/compat
@@ -0,0 +1 @@
+9
--- a/debian/control
+++ b/debian/control
@@ -1,31 +1,17 @@
 Source: libgbinder-radio
 Priority: optional
-Maintainer: UBports developers <devs@ubports.com>
-Build-Depends: debhelper-compat (= 12),
-               libgbinder-dev (>= 1.1.14),
-               libglib2.0-dev,
-               libglibutil-dev,
+Maintainer: Danct12 <danct12@disroot.org>
+Build-Depends: debhelper (>=9), libgbinder-dev (>= 1.1.14), libglibutil-dev (>= 1.0.49)
 Standards-Version: 3.9.6
-Section: libs
-Homepage: https://github.com/mer-hybris/libgbinder-radio
-Vcs-Git: https://github.com/mer-hybris/libgbinder-radio.git
-Vcs-Browser: https://github.com/mer-hybris/libgbinder-radio

-Package: libgbinder-radio1-dev
+Package: libgbinder-radio-dev
 Section: libdevel
 Architecture: any
-Depends: libgbinder-radio1 (= ${binary:Version}),
-         ${misc:Depends}
-Description: Client library for Android radio interfaces (development files)
- A helper library based on glib which allows communicating with Android radio
- interfaces via Binder.
+Depends: libgbinder-radio (= ${binary:Version}), ${misc:Depends}
+Description: Development files for libgbinder-radio

-Package: libgbinder-radio1
+Package: libgbinder-radio
 Section: libs
 Architecture: any
-Depends: libgbinder (>= 1.0.9),
-         ${shlibs:Depends},
-         ${misc:Depends}
-Description: Client library for Android radio interfaces
- A helper library based on glib which allows communicating with Android radio
- interfaces via Binder.
+Depends: libgbinder (>= 1.1.14), libglibutil (>= 1.0.49), ${shlibs:Depends}, ${misc:Depends}
+Description: Binder client library for Android radio interfaces
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
-Copyright (C) 2018-2021 Jolla Ltd.
-Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+Copyright (C) 2018-2022 Jolla Ltd.
+Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>

 You may use this file under the terms of the BSD license as follows:

--- a/debian/libgbinder-radio1-dev.install.in
+++ b/debian/libgbinder-radio1-dev.install.in
@@ -1,3 +0,0 @@
-debian/tmp/@LIBDIR@/libgbinder-radio.so @LIBDIR@
-debian/tmp/@LIBDIR@/pkgconfig/libgbinder-radio.pc @LIBDIR@/pkgconfig
-debian/tmp/usr/include/* usr/include
--- a/debian/libgbinder-radio1.install.in
+++ b/debian/libgbinder-radio1.install.in
@@ -1 +0,0 @@
-debian/tmp/@LIBDIR@/libgbinder-radio.so.* @LIBDIR@
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,11 @@
 #!/usr/bin/make -f
 # Uncomment to enable verbose build
 #export DH_VERBOSE = 1
-export DEB_BUILD_OPTIONS='nostrip debug'

 LIBDIR=usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)

 override_dh_auto_build:
-	dh_auto_build -- LIBDIR=$(LIBDIR) release pkgconfig debian/libgbinder-radio1.install debian/libgbinder-radio1-dev.install
+	dh_auto_build -- LIBDIR=$(LIBDIR) release pkgconfig debian/libgbinder-radio.install debian/libgbinder-radio-dev.install

 override_dh_auto_install:
 	dh_auto_install -- LIBDIR=$(LIBDIR) install-dev
--- a/include/radio_config_types.h
+++ b/include/radio_config_types.h
@@ -48,6 +48,7 @@ typedef enum radio_config_interface {
    RADIO_CONFIG_INTERFACE_1_0,
    RADIO_CONFIG_INTERFACE_1_1,
    RADIO_CONFIG_INTERFACE_1_2, /* Since 1.5.0 */
+    RADIO_CONFIG_INTERFACE_1_3, /* Since 1.6.1 */
    RADIO_CONFIG_INTERFACE_COUNT
 } RADIO_CONFIG_INTERFACE;

@@ -61,18 +62,23 @@ typedef enum radio_config_interface {
 #define RADIO_CONFIG_IFACE_1_0(x)     RADIO_CONFIG_IFACE_PREFIX "1.0::" x
 #define RADIO_CONFIG_IFACE_1_1(x)     RADIO_CONFIG_IFACE_PREFIX "1.1::" x
 #define RADIO_CONFIG_IFACE_1_2(x)     RADIO_CONFIG_IFACE_PREFIX "1.2::" x
+#define RADIO_CONFIG_IFACE_1_3(x)     RADIO_CONFIG_IFACE_PREFIX "1.3::" x
 #define RADIO_CONFIG_1_0              RADIO_CONFIG_IFACE_1_0(RADIO_CONFIG_IFACE)
 #define RADIO_CONFIG_1_1              RADIO_CONFIG_IFACE_1_1(RADIO_CONFIG_IFACE)
 #define RADIO_CONFIG_1_2              RADIO_CONFIG_IFACE_1_2(RADIO_CONFIG_IFACE)
+#define RADIO_CONFIG_1_3              RADIO_CONFIG_IFACE_1_3(RADIO_CONFIG_IFACE)
 #define RADIO_CONFIG_1_0_FQNAME       RADIO_CONFIG_1_0 "/" RADIO_CONFIG_INSTANCE
 #define RADIO_CONFIG_1_1_FQNAME       RADIO_CONFIG_1_1 "/" RADIO_CONFIG_INSTANCE
 #define RADIO_CONFIG_1_2_FQNAME       RADIO_CONFIG_1_2 "/" RADIO_CONFIG_INSTANCE
+#define RADIO_CONFIG_1_3_FQNAME       RADIO_CONFIG_1_3 "/" RADIO_CONFIG_INSTANCE
 #define RADIO_CONFIG_RESPONSE_1_0 \
        RADIO_CONFIG_IFACE_1_0(RADIO_CONFIG_RESPONSE_IFACE)
 #define RADIO_CONFIG_RESPONSE_1_1 \
        RADIO_CONFIG_IFACE_1_1(RADIO_CONFIG_RESPONSE_IFACE)
 #define RADIO_CONFIG_RESPONSE_1_2 \
        RADIO_CONFIG_IFACE_1_2(RADIO_CONFIG_RESPONSE_IFACE)
+#define RADIO_CONFIG_RESPONSE_1_3 \
+        RADIO_CONFIG_IFACE_1_3(RADIO_CONFIG_RESPONSE_IFACE)
 #define RADIO_CONFIG_INDICATION_1_0 \
        RADIO_CONFIG_IFACE_1_0(RADIO_CONFIG_INDICATION_IFACE)
 #define RADIO_CONFIG_INDICATION_1_1 \
@@ -133,6 +139,9 @@ G_STATIC_ASSERT(sizeof(RadioModemsConfig) == 1);
    c(6,5,setModemsConfig,SET_MODEMS_CONFIG) \
    c(7,6,getModemsConfig,GET_MODEMS_CONFIG)

+#define RADIO_CONFIG_CALL_1_3(c) \
+    c(8,8,getHalDeviceCapabilities,GET_HAL_DEVICE_CAPABILITIES) /* Since 1.6.1 */
+
 /* i(code,Name,IND_NAME) */
 #define RADIO_CONFIG_IND_1_0(i) \
    i(1,simSlotsStatusChanged,SIM_SLOTS_STATUS_CHANGED)
@@ -152,7 +161,11 @@ typedef enum radio_config_req {

    /* android.hardware.radio.config@1.1::IRadioConfig */
    RADIO_CONFIG_CALL_1_1(RADIO_CONFIG_REQ_)
-    RADIO_CONFIG_1_1_REQ_LAST = RADIO_CONFIG_REQ_GET_MODEMS_CONFIG
+    RADIO_CONFIG_1_1_REQ_LAST = RADIO_CONFIG_REQ_GET_MODEMS_CONFIG,
+
+    /* android.hardware.radio.config@1.3::IRadioConfig */
+    RADIO_CONFIG_CALL_1_3(RADIO_CONFIG_REQ_)
+    RADIO_CONFIG_1_3_REQ_LAST = RADIO_CONFIG_REQ_GET_HAL_DEVICE_CAPABILITIES

 #undef RADIO_CONFIG_REQ_
 } RADIO_CONFIG_REQ;
@@ -173,7 +186,11 @@ typedef enum radio_config_resp {

    /* android.hardware.radio.config@1.2::IRadioConfigResponse */
    RADIO_CONFIG_RESP_GET_SIM_SLOTS_STATUS_1_2 = 7, /* Since 1.5.0 */
-    RADIO_CONFIG_1_2_RESP_LAST = RADIO_CONFIG_RESP_GET_SIM_SLOTS_STATUS_1_2
+    RADIO_CONFIG_1_2_RESP_LAST = RADIO_CONFIG_RESP_GET_SIM_SLOTS_STATUS_1_2,
+
+    /* android.hardware.radio.config@1.3::IRadioConfigResponse */
+    RADIO_CONFIG_CALL_1_3(RADIO_CONFIG_RESP_)
+    RADIO_CONFIG_1_3_RESP_LAST = RADIO_CONFIG_RESP_GET_HAL_DEVICE_CAPABILITIES
 #undef RADIO_CONFIG_RESP_
 } RADIO_CONFIG_RESP;
 G_STATIC_ASSERT(sizeof(RADIO_CONFIG_RESP) == 4);
--- a/include/radio_types.h
+++ b/include/radio_types.h
@@ -63,6 +63,7 @@ typedef enum radio_interface {
    RADIO_INTERFACE_1_3,
    RADIO_INTERFACE_1_4,
    RADIO_INTERFACE_1_5, /* Since 1.5.0 */
+    RADIO_INTERFACE_1_6, /* Since 1.6.1 */
    RADIO_INTERFACE_COUNT
 } RADIO_INTERFACE; /* Since 1.2.0 */

@@ -100,24 +101,28 @@ typedef enum radio_observer_priority {
 #define RADIO_IFACE_1_3(x)     RADIO_IFACE_PREFIX "1.3::" x
 #define RADIO_IFACE_1_4(x)     RADIO_IFACE_PREFIX "1.4::" x
 #define RADIO_IFACE_1_5(x)     RADIO_IFACE_PREFIX "1.5::" x
+#define RADIO_IFACE_1_6(x)     RADIO_IFACE_PREFIX "1.6::" x
 #define RADIO_1_0              RADIO_IFACE_1_0(RADIO_IFACE)
 #define RADIO_1_1              RADIO_IFACE_1_1(RADIO_IFACE)
 #define RADIO_1_2              RADIO_IFACE_1_2(RADIO_IFACE)
 #define RADIO_1_3              RADIO_IFACE_1_3(RADIO_IFACE)
 #define RADIO_1_4              RADIO_IFACE_1_4(RADIO_IFACE)
 #define RADIO_1_5              RADIO_IFACE_1_5(RADIO_IFACE)
+#define RADIO_1_6              RADIO_IFACE_1_6(RADIO_IFACE)
 #define RADIO_RESPONSE_1_0     RADIO_IFACE_1_0(RADIO_RESPONSE_IFACE)
 #define RADIO_RESPONSE_1_1     RADIO_IFACE_1_1(RADIO_RESPONSE_IFACE)
 #define RADIO_RESPONSE_1_2     RADIO_IFACE_1_2(RADIO_RESPONSE_IFACE)
 #define RADIO_RESPONSE_1_3     RADIO_IFACE_1_3(RADIO_RESPONSE_IFACE)
 #define RADIO_RESPONSE_1_4     RADIO_IFACE_1_4(RADIO_RESPONSE_IFACE)
 #define RADIO_RESPONSE_1_5     RADIO_IFACE_1_5(RADIO_RESPONSE_IFACE)
+#define RADIO_RESPONSE_1_6     RADIO_IFACE_1_6(RADIO_RESPONSE_IFACE)
 #define RADIO_INDICATION_1_0   RADIO_IFACE_1_0(RADIO_INDICATION_IFACE)
 #define RADIO_INDICATION_1_1   RADIO_IFACE_1_1(RADIO_INDICATION_IFACE)
 #define RADIO_INDICATION_1_2   RADIO_IFACE_1_2(RADIO_INDICATION_IFACE)
 #define RADIO_INDICATION_1_3   RADIO_IFACE_1_3(RADIO_INDICATION_IFACE)
 #define RADIO_INDICATION_1_4   RADIO_IFACE_1_4(RADIO_INDICATION_IFACE)
 #define RADIO_INDICATION_1_5   RADIO_IFACE_1_5(RADIO_INDICATION_IFACE)
+#define RADIO_INDICATION_1_6   RADIO_IFACE_1_6(RADIO_INDICATION_IFACE)

 /* Types defined in types.hal */

@@ -196,6 +201,11 @@ typedef enum radio_error {
    RADIO_ERROR_DEVICE_IN_USE = 64,
    RADIO_ERROR_ABORTED = 65,
    RADIO_ERROR_INVALID_RESPONSE = 66,
+    RADIO_ERROR_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED = 67,
+    RADIO_ERROR_ACCESS_BARRED = 68,
+    RADIO_ERROR_BLOCKED_DUE_TO_CALL = 69,
+    RADIO_ERROR_RF_HARDWARE_ISSUE = 70,
+    RADIO_ERROR_NO_RF_CALIBRATION_INFO = 71,
    RADIO_ERROR_OEM_ERROR_1 = 501,
    RADIO_ERROR_OEM_ERROR_2 = 502,
    RADIO_ERROR_OEM_ERROR_3 = 503,
@@ -852,6 +862,7 @@ typedef enum radio_ngran_band {
    RADIO_NGRAN_BAND_18 = 18,
    RADIO_NGRAN_BAND_20 = 20,
    RADIO_NGRAN_BAND_25 = 25,
+    RADIO_NGRAN_BAND_26 = 26,
    RADIO_NGRAN_BAND_28 = 28,
    RADIO_NGRAN_BAND_29 = 29,
    RADIO_NGRAN_BAND_30 = 30,
@@ -860,9 +871,11 @@ typedef enum radio_ngran_band {
    RADIO_NGRAN_BAND_39 = 39,
    RADIO_NGRAN_BAND_40 = 40,
    RADIO_NGRAN_BAND_41 = 41,
+    RADIO_NGRAN_BAND_46 = 46,
    RADIO_NGRAN_BAND_48 = 48,
    RADIO_NGRAN_BAND_50 = 50,
    RADIO_NGRAN_BAND_51 = 51,
+    RADIO_NGRAN_BAND_53 = 53,
    RADIO_NGRAN_BAND_65 = 65,
    RADIO_NGRAN_BAND_66 = 66,
    RADIO_NGRAN_BAND_70 = 70,
@@ -886,6 +899,7 @@ typedef enum radio_ngran_band {
    RADIO_NGRAN_BAND_93 = 93,
    RADIO_NGRAN_BAND_94 = 94,
    RADIO_NGRAN_BAND_95 = 95,
+    RADIO_NGRAN_BAND_96 = 96,
    RADIO_NGRAN_BAND_257 = 257,
    RADIO_NGRAN_BAND_258 = 258,
    RADIO_NGRAN_BAND_260 = 260,
@@ -1310,6 +1324,9 @@ typedef enum radio_data_call_fail_cause {
    RADIO_DATA_CALL_FAIL_VSNCP_RECONNECT_NOT_ALLOWED = 0x8C9,
    RADIO_DATA_CALL_FAIL_IPV6_PREFIX_UNAVAILABLE = 0x8CA,
    RADIO_DATA_CALL_FAIL_HANDOFF_PREFERENCE_CHANGED = 0x8CB,
+    RADIO_DATA_CALL_FAIL_SLICE_REJECTED = 0x8CC,
+    RADIO_DATA_CALL_FAIL_MATCH_ALL_RULE_NOT_ALLOWED = 0x8CD,
+    RADIO_DATA_CALL_FAIL_ALL_MATCHING_RULES_FAILED = 0x8CE,
    RADIO_DATA_CALL_FAIL_OEM_DCFAILCAUSE_1 = 0x1001,
    RADIO_DATA_CALL_FAIL_OEM_DCFAILCAUSE_2 = 0x1002,
    RADIO_DATA_CALL_FAIL_OEM_DCFAILCAUSE_3 = 0x1003,
@@ -1423,6 +1440,12 @@ typedef struct radio_call_1_2 {
 } RADIO_ALIGNED(8) RadioCall_1_2; /* Since 1.2.3 */
 G_STATIC_ASSERT(sizeof(RadioCall_1_2) == 96);

+typedef struct radio_call_1_6 {
+    RadioCall_1_2 base RADIO_ALIGNED(8);
+    GBinderHidlString forwardedNumber RADIO_ALIGNED(8);
+} RADIO_ALIGNED(8) RadioCall_1_6; /* Since 1.2.3 */
+G_STATIC_ASSERT(sizeof(RadioCall_1_6) == 112);
+
 typedef struct radio_dial {
    GBinderHidlString address RADIO_ALIGNED(8);
    RADIO_CLIR clir RADIO_ALIGNED(4);
@@ -1562,6 +1585,93 @@ typedef struct radio_data_call_1_5 {
 } RADIO_ALIGNED(8) RadioDataCall_1_5; /* Since 1.5.0 */
 G_STATIC_ASSERT(sizeof(RadioDataCall_1_5) == 112);

+typedef struct radio_qos_bandwidth {
+    guint32 maxBitrateKbps RADIO_ALIGNED(4);
+    guint32 guaranteedBitrateKbps RADIO_ALIGNED(4);
+} RADIO_ALIGNED(4) RadioQosBandwidth; /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioQosBandwidth) == 8);
+
+typedef struct radio_eps_qos {
+    guint16 qci RADIO_ALIGNED(2);
+    RadioQosBandwidth downlink RADIO_ALIGNED(4);
+    RadioQosBandwidth uplink RADIO_ALIGNED(4);
+} RADIO_ALIGNED(4) RadioEpsQos; /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioEpsQos) == 20);
+
+typedef struct radio_nr_qos {
+    guint16 fiveQi RADIO_ALIGNED(2);
+    RadioQosBandwidth downlink RADIO_ALIGNED(4);
+    RadioQosBandwidth uplink RADIO_ALIGNED(4);
+    guint8 qfi RADIO_ALIGNED(1) /* 1-63 */;
+    guint16 averagingWindowMs RADIO_ALIGNED(2);
+} RADIO_ALIGNED(4) RadioNrQos; /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioNrQos) == 24);
+
+typedef struct radio_slice_info {
+    guint8 sst RADIO_ALIGNED(1); /* SliceServiceType */
+    gint32 sliceDifferentiator RADIO_ALIGNED(4);
+    guint8 mappedHplmnSst RADIO_ALIGNED(1); /* SliceServiceType */
+    gint32 mappedHplmnSD RADIO_ALIGNED(4);
+    gint8 status RADIO_ALIGNED(1); /* SliceStatus */
+} RADIO_ALIGNED(4) RadioSliceInfo; /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioSliceInfo) == 20);
+
+typedef struct radio_optional_slice_info {
+    guint8 available RADIO_ALIGNED(1);
+    RadioSliceInfo sliceInfo RADIO_ALIGNED(4);
+} RADIO_ALIGNED(4) RadioOptionalSliceInfo; /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioOptionalSliceInfo) == 24);
+
+typedef struct radio_dnn {
+    guint8 available RADIO_ALIGNED(1);
+    GBinderHidlString dnn RADIO_ALIGNED(8);
+} RADIO_ALIGNED(8) RadioDnn; /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioDnn) == 24);
+
+typedef struct radio_os_app_id {
+    guint8 available RADIO_ALIGNED(1);
+    GBinderHidlVec osAppId RADIO_ALIGNED(8); /* vec<uint8_t> */
+} RADIO_ALIGNED(8) RadioOsAppId; /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioOsAppId) == 24);
+
+typedef struct radio_traffic_descriptor {
+    RadioDnn dnn RADIO_ALIGNED(8);
+    RadioOsAppId osAppId RADIO_ALIGNED(8);
+} RADIO_ALIGNED(8) RadioTrafficDescriptor; /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioTrafficDescriptor) == 48);
+
+typedef struct radio_optional_traffic_descriptor {
+    guint8 available RADIO_ALIGNED(1);
+    RadioTrafficDescriptor trafficDescriptor RADIO_ALIGNED(8);
+} RADIO_ALIGNED(8) RadioOptionalTrafficDescriptor; /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioOptionalTrafficDescriptor) == 56);
+
+typedef struct radio_data_call_1_6 {
+    RADIO_DATA_CALL_FAIL_CAUSE cause RADIO_ALIGNED(4);
+    gint64 suggestedRetryTime RADIO_ALIGNED(4);
+    gint32 cid RADIO_ALIGNED(4);
+    RADIO_DATA_CALL_ACTIVE_STATUS active RADIO_ALIGNED(4);
+    RADIO_PDP_PROTOCOL_TYPE type RADIO_ALIGNED(4);
+    GBinderHidlString ifname RADIO_ALIGNED(8);
+    GBinderHidlVec addresses RADIO_ALIGNED(8); /* vec<RadioLinkAddress> */
+    GBinderHidlVec dnses RADIO_ALIGNED(8);     /* vec<GBinderHidlString> */
+    GBinderHidlVec gateways RADIO_ALIGNED(8);  /* vec<GBinderHidlString> */
+    GBinderHidlVec pcscf RADIO_ALIGNED(8);     /* vec<GBinderHidlString> */
+    gint32 mtuV4 RADIO_ALIGNED(4);
+    gint32 mtuV6 RADIO_ALIGNED(4);
+    guint8 qosType RADIO_ALIGNED(1); /* QOS_TYPE */
+    union {
+        RadioEpsQos eps;
+        RadioNrQos nr;
+    } RADIO_ALIGNED(4) defaultQos;
+    GBinderHidlVec qosSessions RADIO_ALIGNED(8); /* vec<QosSession> */
+    gint8 handoverFailureMode RADIO_ALIGNED(1) /* HandoverFailureMode */;
+    gint32 pduSessionId RADIO_ALIGNED(4);
+    RadioOptionalSliceInfo value RADIO_ALIGNED(4);
+    GBinderHidlVec trafficDescriptors RADIO_ALIGNED(8); /* vec<TrafficDescriptor> */
+} RADIO_ALIGNED(8) RadioDataCall_1_6; /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioDataCall_1_6) == 216);
+
 typedef struct radio_sms_write_args {
    gint32 status RADIO_ALIGNED(4);
    GBinderHidlString pdu RADIO_ALIGNED(8);
@@ -1947,6 +2057,29 @@ typedef struct radio_reg_state_result_1_5 {
 } RADIO_ALIGNED(8) RadioRegStateResult_1_5; /* Since 1.5.0 */
 G_STATIC_ASSERT(sizeof(RadioRegStateResult_1_5) == 224);

+typedef struct radio_nr_vops_info {
+    guint8 vopsSupported RADIO_ALIGNED(1);
+    guint8 emcSupported RADIO_ALIGNED(1);
+    guint8 emfSupported RADIO_ALIGNED(1);
+} RADIO_ALIGNED(1) RadioNrVopsInfo;  /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioNrVopsInfo) == 3);
+
+typedef struct radio_reg_state_result_1_6 {
+    RADIO_REG_STATE regState RADIO_ALIGNED(4);
+    RADIO_TECH rat RADIO_ALIGNED(4);
+    gint32 reasonDataDenied RADIO_ALIGNED(4);
+    RadioCellIdentity_1_5 cellIdentity RADIO_ALIGNED(8);
+    GBinderHidlString registeredPlmn RADIO_ALIGNED(8);
+    guint8 accessTechnologySpecificInfoType RADIO_ALIGNED(1); /* RADIO_REG_ACCESS_TECHNOLOGY_SPECIFIC_INFO_TYPE */
+    union {
+        RadioRegCdma2000RegistrationInfo cdmaInfo RADIO_ALIGNED(4);
+        RadioRegEutranRegistrationInfo eutranInfo RADIO_ALIGNED(1);
+        RadioNrVopsInfo ngranNrVopsInfo RADIO_ALIGNED(1);
+        gboolean geranDtmSupported RADIO_ALIGNED(1);
+    } accessTechnologySpecificInfo RADIO_ALIGNED(4);
+} RADIO_ALIGNED(8) RadioRegStateResult_1_6; /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioRegStateResult_1_6) == 224);
+
 typedef struct radio_signal_strength_gsm {
    guint32 signalStrength RADIO_ALIGNED(4);
    guint32 bitErrorRate RADIO_ALIGNED(4);
@@ -2042,6 +2175,30 @@ typedef struct radio_signal_strength_1_4 {
 } RADIO_ALIGNED(4) RadioSignalStrength_1_4; /* Since 1.2.5 */
 G_STATIC_ASSERT(sizeof(RadioSignalStrength_1_4) == 108);

+typedef struct radio_signal_strength_lte_1_6 {
+    RadioSignalStrengthLte base RADIO_ALIGNED(4);
+    guint32 cqiTableIndex RADIO_ALIGNED(4);
+} RADIO_ALIGNED(4) RadioSignalStrengthLte_1_6; /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioSignalStrengthLte_1_6) == 28);
+
+typedef struct radio_signal_strength_nr_1_6 {
+    RadioSignalStrengthNr base RADIO_ALIGNED(4);
+    guint32 csiCqiTableIndex RADIO_ALIGNED(4);
+    GBinderHidlVec csiCqiReport RADIO_ALIGNED(8);
+} RADIO_ALIGNED(8) RadioSignalStrengthNr_1_6; /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioSignalStrengthNr_1_6) == 48);
+
+typedef struct radio_signal_strength_1_6 {
+    RadioSignalStrengthGsm gsm RADIO_ALIGNED(4);
+    RadioSignalStrengthCdma cdma RADIO_ALIGNED(4);
+    RadioSignalStrengthEvdo evdo RADIO_ALIGNED(4);
+    RadioSignalStrengthLte_1_6 lte RADIO_ALIGNED(4);
+    RadioSignalStrengthTdScdma_1_2 tdscdma RADIO_ALIGNED(4);
+    RadioSignalStrengthWcdma_1_2 wcdma RADIO_ALIGNED(4);
+    RadioSignalStrengthNr_1_6 nr RADIO_ALIGNED(4);
+} RADIO_ALIGNED(4) RadioSignalStrength_1_6; /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioSignalStrength_1_6) == 136);
+
 typedef struct radio_cell_info_gsm {
    RadioCellIdentityGsm cellIdentityGsm RADIO_ALIGNED(8);
    RadioSignalStrengthGsm signalStrengthGsm RADIO_ALIGNED(4);
@@ -2178,6 +2335,33 @@ typedef struct radio_cell_info_1_5 {
 } RADIO_ALIGNED(8) RadioCellInfo_1_5; /* Since 1.5.0 */
 G_STATIC_ASSERT(sizeof(RadioCellInfo_1_5) == 216);

+typedef struct radio_cell_info_lte_1_6 {
+    RadioCellIdentityLte_1_5 cellIdentityLte RADIO_ALIGNED(8);
+    RadioSignalStrengthLte_1_6 signalStrengthLte RADIO_ALIGNED(4);
+} RADIO_ALIGNED(8) RadioCellInfoLte_1_6; /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioCellInfoLte_1_6) == 192);
+
+typedef struct radio_cell_info_nr_1_6 {
+    RadioCellIdentityNr_1_5 cellIdentityNr RADIO_ALIGNED(8);
+    RadioSignalStrengthNr_1_6 signalStrengthNr RADIO_ALIGNED(4);
+} RADIO_ALIGNED(8) RadioCellInfoNr_1_6; /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioCellInfoNr_1_6) == 168);
+
+typedef struct radio_cell_info_1_6 {
+    guint8 registered RADIO_ALIGNED(1);
+    RADIO_CELL_CONNECTION_STATUS connectionStatus RADIO_ALIGNED(4);
+    guint8 cellInfoType RADIO_ALIGNED(8); /* RADIO_CELL_INFO_TYPE_1_5 */
+    union {
+        RadioCellInfoGsm_1_5 gsm RADIO_ALIGNED(8);
+        RadioCellInfoWcdma_1_5 wcdma RADIO_ALIGNED(8);
+        RadioCellInfoTdscdma_1_5 tdscdma RADIO_ALIGNED(8);
+        RadioCellInfoLte_1_6 lte RADIO_ALIGNED(8);
+        RadioCellInfoNr_1_6 nr RADIO_ALIGNED(8);
+        RadioCellInfoCdma_1_2 cdma RADIO_ALIGNED(8);
+    } info RADIO_ALIGNED(8);
+} RADIO_ALIGNED(8) RadioCellInfo_1_6; /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioCellInfo_1_6) == 208);
+
 typedef struct radio_physical_channel_config {
    RADIO_CELL_CONNECTION_STATUS connectionStatus RADIO_ALIGNED(4);
    gint32 cellBandwidthDownlink RADIO_ALIGNED(4);
@@ -2202,6 +2386,25 @@ typedef struct radio_physical_channel_config_1_4 {
 } RADIO_ALIGNED(8) RadioPhysicalChannelConfig_1_4; /* Since 1.5.4 */
 G_STATIC_ASSERT(sizeof(RadioPhysicalChannelConfig_1_4) == 48);

+typedef struct radio_physical_channel_config_1_6 {
+    RADIO_CELL_CONNECTION_STATUS connectionStatus RADIO_ALIGNED(4);
+    RADIO_TECH rat RADIO_ALIGNED(4);
+    gint32 downlinkChannelNumber RADIO_ALIGNED(4);
+    gint32 uplinkChannelNumber RADIO_ALIGNED(4);
+    gint32 cellBandwidthDownlinkKhz RADIO_ALIGNED(4);
+    gint32 cellBandwidthUplinkKhz RADIO_ALIGNED(4);
+    GBinderHidlVec contextIds RADIO_ALIGNED(8); /* vec<gint32> */
+    guint32 physicalCellId RADIO_ALIGNED(4);
+    guint8 bandType RADIO_ALIGNED(1); /* BAND_TYPE */
+    union {
+        gint32 geranBand;
+        gint32 utranBand;
+        gint32 eutranBand;
+        gint32 ngranBand;
+    } RADIO_ALIGNED(4) band;
+} RADIO_ALIGNED(8) RadioPhysicalChannelConfig_1_6; /* Since 1.6.1 */
+G_STATIC_ASSERT(sizeof(RadioPhysicalChannelConfig_1_6) == 56);
+
 typedef struct radio_gsm_broadcast_sms_config {
    gint32 fromServiceId RADIO_ALIGNED(4);
    gint32 toServiceId RADIO_ALIGNED(4);
@@ -2288,6 +2491,7 @@ typedef struct radio_network_scan_result {
                                               /* or vec<RadioCellInfo_1_2> */
                                               /* or vec<RadioCellInfo_1_4> */
                                               /* or vec<RadioCellInfo_1_5> */
+                                               /* or vec<RadioCellInfo_1_6> */
 } RADIO_ALIGNED(8) RadioNetworkScanResult; /* Since 1.2.5 */
 G_STATIC_ASSERT(sizeof(RadioNetworkScanResult) == 24);

@@ -2517,6 +2721,35 @@ G_STATIC_ASSERT(sizeof(RadioNetworkScanRequest_1_5) == 56);
    c(171,176,sendCdmaSmsExpectMore,SEND_CDMA_SMS_EXPECT_MORE,) \
    c(172,177,supplySimDepersonalization,SUPPLY_SIM_PERSONALIZATION,)

+#define RADIO_CALL_1_6_(c) /* Since 1.6.1 */ \
+    c(173,179,setRadioPower,SET_RADIO_POWER,_1_6) \
+    c(174,181,getDataCallList,GET_DATA_CALL_LIST,_1_6) \
+    c(175,180,setupDataCall,SETUP_DATA_CALL,_1_6) \
+    c(176,182,sendSms,SEND_SMS,_1_6) \
+    c(177,183,sendSmsExpectMore,SEND_SMS_EXPECT_MORE,_1_6) \
+    c(178,184,sendCdmaSms,SEND_CDMA_SMS,_1_6) \
+    c(179,185,sendCdmaSmsExpectMore,SEND_CDMA_SMS_EXPECT_MORE,_1_6) \
+    c(180,186,setSimCardPower,SET_SIM_CARD_POWER,_1_6) \
+    c(181,187,setNrDualConnectivityState,SET_NR_DUAL_CONNECTIVITY_STATE,) \
+    c(182,188,isNrDualConnectivityEnabled,IS_NR_DUAL_CONNECTIVITY_ENABLED,) \
+    c(183,189,allocatePduSessionId,ALLOCATE_PDU_SESSION_ID,) \
+    c(184,190,releasePduSessionId,RELEASE_PDU_SESSION_ID,) \
+    c(185,191,startHandover,START_HANDOVER,) \
+    c(186,192,cancelHandover,CANCEL_HANDOVER,) \
+    c(187,193,setAllowedNetworkTypesBitmap,SET_ALLOWED_NETWORK_TYPES_BITMAP,) \
+    c(188,194,getAllowedNetworkTypesBitmap,GET_ALLOWED_NETWORK_TYPES_BITMAP,) \
+    c(189,195,setDataThrottling,SET_DATA_THROTTLING,) \
+    c(191,196,getSystemSelectionChannels,GET_SYSTEM_SELECTION_CHANNELS,) \
+    c(192,197,getCellInfoList,GET_CELL_INFO_LIST,_1_6) \
+    c(193,199,getVoiceRegistrationState,GET_VOICE_REGISTRATION_STATE,_1_6) \
+    c(194,198,getSignalStrength,GET_SIGNAL_STRENGTH,_1_6) \
+    c(195,200,getDataRegistrationState,GET_DATA_REGISTRATION_STATE,_1_6) \
+    c(196,201,getCurrentCalls,GET_CURRENT_CALLS,_1_6) \
+    c(197,202,getSlicingConfig,GET_SLICING_CONFIG,) \
+    c(199,203,getSimPhonebookRecords,GET_SIM_PHONEBOOK_RECORDS,) \
+    c(200,204,getSimPhonebookCapacity,GET_SIM_PHONEBOOK_CAPACITY,) \
+    c(201,205,updateSimPhonebookRecords,UPDATE_SIM_PHONEBOOK_RECORDS,)
+
 /* e(code,eventName,EVENT_NAME) */
 #define RADIO_EVENT_1_0(e) \
    e(1,radioStateChanged,RADIO_STATE_CHANGED) \
@@ -2593,6 +2826,17 @@ G_STATIC_ASSERT(sizeof(RadioNetworkScanRequest_1_5) == 56);
    e(64,networkScanResult_1_5,NETWORK_SCAN_RESULT_1_5) \
    e(65,dataCallListChanged_1_5,DATA_CALL_LIST_CHANGED_1_5)

+#define RADIO_EVENT_1_6(e)  /* Since 1.6.1 */ \
+    e(66,dataCallListChanged_1_6,DATA_CALL_LIST_CHANGED_1_6) \
+    e(67,unthrottleApn, UNTHROTTLE_APN) \
+    e(68,currentLinkCapacityEstimate_1_6, CURRENT_LINK_CAPACITY_ESTIMATE_1_6) \
+    e(69,currentSignalStrength_1_6,CURRENT_SIGNAL_STRENGTH_1_6) \
+    e(70,cellInfoList_1_6,CELL_INFO_LIST_1_6) \
+    e(71,networkScanResult_1_6,NETWORK_SCAN_RESULT_1_6) \
+    e(72,currentPhysicalChannelConfigs_1_6,CURRENT_PHYSICAL_CHANNEL_CONFIGS_1_6) \
+    e(73,simPhonebookChanged, SIM_PHONEBOOK_CHANGED) \
+    e(74,simPhonebookRecordsReceived, SIM_PHONEBOOK_RECORDS_RECEIVED)
+
 typedef enum radio_req {
    RADIO_REQ_ANY = 0,
    RADIO_REQ_NONE = 0,
@@ -2629,7 +2873,13 @@ typedef enum radio_req {

    /* android.hardware.radio@1.5::IRadio */
    RADIO_CALL_1_5_(RADIO_REQ__) /* Since 1.5.0 */
-    RADIO_1_5_REQ_LAST = RADIO_REQ_SUPPLY_SIM_PERSONALIZATION
+    RADIO_1_5_REQ_LAST = RADIO_REQ_SUPPLY_SIM_PERSONALIZATION,
+
+    /* android.hardware.radio@1.6::IRadio */
+    RADIO_CALL_1_6_(RADIO_REQ__) /* Since 1.6.1 */
+    RADIO_REQ_EMERGENCY_DIAL_1_6 = 190,
+    RADIO_REQ_SET_CARRIER_INFO_FOR_IMSI_ENCRYPTION_1_6 = 198,
+    RADIO_1_6_REQ_LAST = RADIO_REQ_UPDATE_SIM_PHONEBOOK_RECORDS
 #undef RADIO_REQ_
 #undef RADIO_REQ__
 } RADIO_REQ;
@@ -2677,7 +2927,11 @@ typedef enum radio_resp {
    RADIO_RESP_GET_DATA_CALL_LIST_1_5 = 166,
    RADIO_RESP_GET_CELL_INFO_LIST_1_5 = 174,
    RADIO_RESP_GET_ICC_CARD_STATUS_1_5 = 178,
-    RADIO_1_5_RESP_LAST = RADIO_RESP_GET_ICC_CARD_STATUS_1_5
+    RADIO_1_5_RESP_LAST = RADIO_RESP_GET_ICC_CARD_STATUS_1_5,
+
+    /* android.hardware.radio@1.6::IRadioResponse */
+    RADIO_CALL_1_6_(RADIO_RESP__) /* Since 1.6.1 */
+    RADIO_1_6_RESP_LAST = RADIO_RESP_UPDATE_SIM_PHONEBOOK_RECORDS
 #undef RADIO_RESP_
 #undef RADIO_RESP__
 } RADIO_RESP;
@@ -2725,7 +2979,11 @@ typedef enum radio_ind {

    /* android.hardware.radio@1.5::IRadioIndication */
    RADIO_EVENT_1_5(RADIO_IND_)
-    RADIO_1_5_IND_LAST = RADIO_IND_DATA_CALL_LIST_CHANGED_1_5 /* Since 1.5.0 */
+    RADIO_1_5_IND_LAST = RADIO_IND_DATA_CALL_LIST_CHANGED_1_5, /* Since 1.5.0 */
+
+    /* android.hardware.radio@1.6::IRadioIndication */
+    RADIO_EVENT_1_6(RADIO_IND_)
+    RADIO_1_6_IND_LAST = RADIO_IND_SIM_PHONEBOOK_RECORDS_RECEIVED /* Since 1.6.1 */
 #undef RADIO_IND_
 } RADIO_IND;
 G_STATIC_ASSERT(sizeof(RADIO_IND) == 4);
--- a/src/radio_base.c
+++ b/src/radio_base.c
@@ -92,7 +92,6 @@ guint32
 radio_base_reserve_serial(
    RadioBase* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    /*
     * Using a static counter practically guarantees that different
     * serials would never be in use simultanously by different
@@ -115,7 +114,6 @@ radio_base_unlink_request(
    RadioRequest* req,
    RadioRequest* prev)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioRequest* next = req->queue_next;

    if (prev) {
@@ -136,7 +134,6 @@ radio_base_dequeue_request(
    RadioBasePriv* q,
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioRequest* ptr = q->queue_first;
    RadioRequest* prev = NULL;

@@ -157,7 +154,6 @@ radio_base_deactivate_request(
    RadioBase* self,
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioBasePriv* priv = self->priv;

    g_hash_table_remove(priv->pending, KEY(req->serial2));
@@ -181,7 +177,6 @@ radio_base_drop_req(
    RadioBase* self,
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    radio_base_cancel_request(self, req);
    radio_base_deactivate_request(self, req);
    radio_base_reset_timeout(self);
@@ -197,7 +192,6 @@ radio_base_detach_req(
    gpointer value,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioRequest* req = value;

    radio_base_cancel_request(THIS(user_data), req);
@@ -212,7 +206,6 @@ radio_base_fail_request(
    RADIO_REQUEST_STATE state,
    RADIO_TX_STATUS status)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    radio_request_ref(req);
    req->state = state;
    if (req->complete) {
@@ -232,7 +225,6 @@ radio_base_request_failed(
    RadioBase* self,
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    radio_base_fail_request(self, req,
        RADIO_REQUEST_STATE_FAILED,
        RADIO_TX_STATUS_FAILED);
@@ -245,7 +237,6 @@ radio_base_request_sent(
    RadioRequest* req,
    int status)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    req->tx_id = 0;
    if (status != GBINDER_STATUS_OK) {
        g_object_ref(self);
@@ -260,7 +251,6 @@ radio_base_submit_transaction(
    RadioBase* self,
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioBasePriv* priv = self->priv;

    if (req->serial2) {
@@ -310,7 +300,6 @@ radio_base_can_set_owner(
    RadioBasePriv* priv,
    RadioRequestGroup* group)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    /*
     * Caller has verified that the group isn't already the owner.
     * It's also been checked that either the owner queue is empty,
@@ -351,7 +340,6 @@ void
 radio_base_move_owner_queue(
    RadioBase* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioBasePriv* priv = self->priv;

    if (!priv->owner && priv->owner_queue) {
@@ -374,7 +362,6 @@ radio_base_can_submit_request(
    RadioBasePriv* priv,
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (priv->block_req) {
        /* The current blocker can be resubmitted */
        return priv->block_req == req;
@@ -414,7 +401,6 @@ radio_base_queue_request(
    RadioBasePriv* priv,
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    req->state = RADIO_REQUEST_STATE_QUEUED;
    if (priv->queue_last) {
        priv->queue_last->queue_next = req;
@@ -429,7 +415,6 @@ guint
 radio_base_submit_queued_requests(
    RadioBase* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioBasePriv* priv = self->priv;
    guint submitted = 0;

@@ -476,7 +461,6 @@ gboolean
 radio_base_timeout(
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioBase* self = THIS(user_data);
    RadioBasePriv* priv = self->priv;
    const gint64 now = g_get_monotonic_time();
@@ -545,7 +529,6 @@ void
 radio_base_initialize(
    RadioBase* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
 }

 void
@@ -553,7 +536,6 @@ radio_base_register_request(
    RadioBase* self,
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    /* Caller makes sure that both arguments are not NULL */
    RadioBasePriv* priv = self->priv;

@@ -567,7 +549,6 @@ radio_base_unregister_request(
    RadioBase* self,
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    /* Caller doesn't check base for NULL */
    if (G_LIKELY(self)) {
        RadioBasePriv* priv = self->priv;
@@ -585,7 +566,6 @@ radio_base_submit_request(
    RadioBase* self,
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    /*
     * Caller makes sure that both arguments are not NULL. Note that if the
     * base is dead, request stays in the NEW state and can be resubmitted
@@ -623,7 +603,6 @@ radio_base_retry_request(
    RadioBase* self,
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    /* Caller makes sure that both arguments are not NULL */
    if (req->state == RADIO_REQUEST_STATE_PENDING &&
        radio_base_can_retry(req)) {
@@ -648,7 +627,6 @@ void
 radio_base_request_dropped(
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (req->object) {
        radio_base_drop_req(req->object, req);
    }
@@ -659,7 +637,6 @@ radio_base_timeout_ms(
    RadioBase* self,
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    /* Caller checks object pointer for NULL */
    return req->timeout_ms ? req->timeout_ms : self->priv->default_timeout_ms;
 }
@@ -668,7 +645,6 @@ void
 radio_base_reset_timeout(
    RadioBase* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioBasePriv* priv = self->priv;

    if (g_hash_table_size(priv->active)) {
@@ -731,7 +707,6 @@ radio_base_block_status(
    RadioBase* self,
    RadioRequestGroup* group)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioBasePriv* priv = self->priv;

    /* Caller checks object pointer for NULL */
@@ -749,7 +724,6 @@ radio_base_block(
    RadioBase* self,
    RadioRequestGroup* group)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioBasePriv* priv = self->priv;

    /* Caller checks object pointer for NULL */
@@ -776,7 +750,6 @@ radio_base_unblock(
    RadioBase* self,
    RadioRequestGroup* group)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    /* Parameters are checked by the caller */
    RadioBasePriv* priv = self->priv;

@@ -805,7 +778,6 @@ radio_base_handle_resp(
    const RadioResponseInfo* info,
    const GBinderReader* reader)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioBasePriv* priv = self->priv;
    RadioRequest* req = g_hash_table_lookup(priv->active, KEY(info->serial));

@@ -857,7 +829,6 @@ radio_base_handle_ack(
    RadioBase* self,
    guint32 serial)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioBasePriv* priv = self->priv;
    RadioRequest* req = g_hash_table_lookup(priv->active, KEY(serial));

@@ -873,7 +844,6 @@ void
 radio_base_handle_death(
    RadioBase* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioBasePriv* priv = self->priv;
    RadioRequest* dead = NULL;
    RadioRequest* req;
@@ -920,7 +890,6 @@ void
 radio_base_submit_requests(
    RadioBase* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (radio_base_submit_queued_requests(self)) {
        radio_base_reset_timeout(self);
    }
@@ -931,7 +900,6 @@ radio_base_cancel_request(
    RadioBase* self,
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    req->scheduled = 0;
    if (req->tx_id) {
        RADIO_BASE_GET_CLASS(self)->cancel_request(self, req->tx_id);
@@ -944,7 +912,6 @@ radio_base_set_default_timeout(
    RadioBase* self,
    int ms)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    /* Caller checks object pointer for NULL */
    RadioBasePriv* priv = self->priv;

@@ -981,7 +948,6 @@ radio_base_add_owner_changed_handler(
    RadioBaseFunc fn,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    /* Caller checks object pointer for NULL */
    return G_LIKELY(fn) ?
        g_signal_connect_closure_by_id(self, radio_base_signals[SIGNAL_OWNER],
@@ -997,7 +963,6 @@ void
 radio_base_init(
    RadioBase* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioBasePriv* priv = G_TYPE_INSTANCE_GET_PRIVATE(self, RADIO_TYPE_BASE,
        RadioBasePriv);

@@ -1015,7 +980,6 @@ void
 radio_base_object_finalize(
    GObject* object)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioBase* self = THIS(object);
    RadioBasePriv* priv = self->priv;

@@ -1034,7 +998,6 @@ void
 radio_base_class_init(
    RadioBaseClass* klass)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    g_type_class_add_private(klass, sizeof(RadioBasePriv));
    G_OBJECT_CLASS(klass)->finalize = radio_base_object_finalize;
    radio_base_signals[SIGNAL_OWNER] = g_signal_new(SIGNAL_OWNER_NAME,
--- a/src/radio_client.c
+++ b/src/radio_client.c
@@ -96,7 +96,6 @@ void
 radio_client_call_free(
    RadioClientCall* call)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    radio_request_unref(call->req);
    gutil_slice_free(call);
 }
@@ -107,7 +106,6 @@ radio_client_call_destroy(
    void* user_data1,
    void* user_data2)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    radio_client_call_free(user_data2);
 }

@@ -120,7 +118,6 @@ radio_client_call_complete(
    void* user_data1,
    void* user_data2)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioClientCall* call = user_data2;

    call->callback(RADIO_BASE(user_data1), call->req, status);
@@ -132,7 +129,6 @@ radio_client_handle_death(
    RadioInstance* instance,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioBase* base = RADIO_BASE(user_data);

    g_object_ref(base);
@@ -147,7 +143,6 @@ radio_client_handle_connected(
    RadioInstance* instance,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    g_signal_emit(THIS(user_data), radio_client_signals[SIGNAL_CONNECTED], 0);
    radio_base_submit_requests(RADIO_BASE(user_data));
 }
@@ -159,7 +154,6 @@ radio_client_handle_ack(
    guint32 serial,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    radio_base_handle_ack(RADIO_BASE(user_data), serial);
 }

@@ -172,7 +166,6 @@ radio_client_handle_ind(
    const GBinderReader* reader,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    g_signal_emit(THIS(user_data), radio_client_signals[SIGNAL_INDICATION],
        radio_instance_ind_quark(instance, code), code, reader);
 }
@@ -186,7 +179,6 @@ radio_client_handle_resp(
    const GBinderReader* reader,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (!radio_base_handle_resp(RADIO_BASE(user_data), code, info, reader)) {
        const char* name = radio_resp_name2(instance, code);

@@ -204,7 +196,6 @@ radio_client_add_handler(
    RadioClientFunc fn,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return (G_LIKELY(self) && G_LIKELY(fn)) ?
        g_signal_connect_closure_by_id(self, radio_client_signals[sig], 0,
             g_cclosure_new(G_CALLBACK(fn), user_data, NULL), FALSE) : 0;
@@ -218,7 +209,6 @@ RadioClient*
 radio_client_new(
    RadioInstance* instance)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioClient* self = NULL;

    if (G_LIKELY(instance)) {
@@ -248,7 +238,6 @@ RadioClient*
 radio_client_ref(
    RadioClient* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self)) {
        g_object_ref(self);
    }
@@ -259,7 +248,6 @@ void
 radio_client_unref(
    RadioClient* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self)) {
        g_object_unref(self);
    }
@@ -269,7 +257,6 @@ const char*
 radio_client_slot(
    RadioClient* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return G_LIKELY(self) ? self->instance->slot : NULL;
 }

@@ -277,7 +264,6 @@ gboolean
 radio_client_dead(
    RadioClient* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return !self || self->instance->dead;
 }

@@ -285,7 +271,6 @@ gboolean
 radio_client_connected(
    RadioClient* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return self && self->instance->connected;
 }

@@ -293,7 +278,6 @@ RADIO_INTERFACE
 radio_client_interface(
    RadioClient* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return G_LIKELY(self) ? self->instance->version : RADIO_INTERFACE_NONE;
 }

@@ -301,7 +285,6 @@ RADIO_AIDL_INTERFACE
 radio_client_aidl_interface(
    RadioClient* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return G_LIKELY(self) ? self->instance->interface_aidl : RADIO_AIDL_INTERFACE_NONE;
 }

@@ -310,7 +293,6 @@ radio_client_set_default_timeout(
    RadioClient* self,
    int milliseconds)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self)) {
        radio_base_set_default_timeout(&self->base, milliseconds);
    }
@@ -323,7 +305,6 @@ radio_client_add_indication_handler(
    RadioClientIndicationFunc fn,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return (G_LIKELY(self) && G_LIKELY(fn)) ?
        g_signal_connect_closure_by_id(self,
            radio_client_signals[SIGNAL_INDICATION],
@@ -337,7 +318,6 @@ radio_client_add_owner_changed_handler(
    RadioClientFunc fn,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return self ? radio_base_add_owner_changed_handler(&self->base,
        (RadioBaseFunc) fn, user_data) : 0;
 }
@@ -348,7 +328,6 @@ radio_client_add_death_handler(
    RadioClientFunc fn,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return radio_client_add_handler(self, SIGNAL_DEATH, fn, user_data);
 }

@@ -358,7 +337,6 @@ radio_client_add_connected_handler(
    RadioClientFunc fn,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return radio_client_add_handler(self, SIGNAL_CONNECTED, fn, user_data);
 }

@@ -367,7 +345,6 @@ radio_client_remove_handler(
    RadioClient* self,
    gulong id)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(id) && G_LIKELY(self)) {
        g_signal_handler_disconnect(self, id);
    }
@@ -379,7 +356,6 @@ radio_client_remove_handlers(
    gulong* ids,
    int count)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    gutil_disconnect_handlers(self, ids, count);
 }

@@ -392,7 +368,6 @@ gboolean
 radio_client_is_dead(
    RadioBase* base)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return THIS(base)->instance->dead;
 }

@@ -401,7 +376,6 @@ gboolean
 radio_client_can_submit_requests(
    RadioBase* base)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return THIS(base)->instance->connected;
 }

@@ -411,7 +385,6 @@ radio_client_new_request(
    RadioBase* base,
    guint32 code)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return radio_instance_new_request(THIS(base)->instance, code);
 }

@@ -422,7 +395,6 @@ radio_client_send_request(
    RadioRequest* req,
    RadioBaseRequestSentFunc callback)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioClientCall* call = g_slice_new(RadioClientCall);
    gulong tx_id;

@@ -445,7 +417,6 @@ radio_client_cancel_request(
    RadioBase* base,
    gulong id)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    radio_instance_cancel_request(THIS(base)->instance, id);
 }

@@ -458,7 +429,6 @@ void
 radio_client_init(
    RadioClient* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
 }

 static
@@ -466,7 +436,6 @@ void
 radio_client_finalize(
    GObject* object)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioClient* self = THIS(object);

    radio_instance_remove_all_handlers(self->instance, self->event_ids);
@@ -479,7 +448,6 @@ void
 radio_client_class_init(
    RadioClientClass* klass)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioBaseClass* base_class = RADIO_BASE_CLASS(klass);
    GObjectClass* object_class = G_OBJECT_CLASS(klass);
    GType type = G_OBJECT_CLASS_TYPE(klass);
--- a/src/radio_config.c
+++ b/src/radio_config.c
@@ -115,6 +115,7 @@ static const char* radio_config_signal_observe_indication_name[] = {
 static guint radio_config_signals[SIGNAL_COUNT] = { 0 };

 static const GBinderClientIfaceInfo radio_config_iface_info[] = {
+    {RADIO_CONFIG_1_3, RADIO_CONFIG_1_3_REQ_LAST },
    {RADIO_CONFIG_1_1, RADIO_CONFIG_1_1_REQ_LAST },
    {RADIO_CONFIG_1_1, RADIO_CONFIG_1_1_REQ_LAST },
    {RADIO_CONFIG_1_0, RADIO_CONFIG_1_0_REQ_LAST }
@@ -129,6 +130,7 @@ G_STATIC_ASSERT(G_N_ELEMENTS(radio_config_aidl_iface_info) ==
    RADIO_CONFIG_AIDL_INTERFACE_COUNT);

 static const char* const radio_config_indication_ifaces[] = {
+    RADIO_CONFIG_INDICATION_1_2,
    RADIO_CONFIG_INDICATION_1_2,
    RADIO_CONFIG_INDICATION_1_1,
    RADIO_CONFIG_INDICATION_1_0,
@@ -145,6 +147,7 @@ G_STATIC_ASSERT(G_N_ELEMENTS(radio_config_aidl_indication_ifaces) ==
    RADIO_CONFIG_AIDL_INTERFACE_COUNT + 1);

 static const char* const radio_config_response_ifaces[] = {
+    RADIO_CONFIG_RESPONSE_1_3,
    RADIO_CONFIG_RESPONSE_1_2,
    RADIO_CONFIG_RESPONSE_1_1,
    RADIO_CONFIG_RESPONSE_1_0,
@@ -182,6 +185,7 @@ typedef struct radio_config_interface_desc {
        RADIO_CONFIG_INTERFACE_INDEX(RADIO_CONFIG_INTERFACE_##v)

 static const RadioConfigInterfaceDesc radio_config_interfaces[] = {
+   { RADIO_CONFIG_INTERFACE_DESC(1_3) },
   { RADIO_CONFIG_INTERFACE_DESC(1_2) },
   { RADIO_CONFIG_INTERFACE_DESC(1_1) },
   { RADIO_CONFIG_INTERFACE_DESC(1_0) }
@@ -223,7 +227,6 @@ void
 radio_config_call_free(
    RadioConfigCall* call)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    radio_request_unref(call->req);
    gutil_slice_free(call);
 }
@@ -236,7 +239,6 @@ radio_config_call_complete(
    int status,
    void* user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioConfigCall* call = user_data;

    call->callback(call->object, call->req, status);
@@ -248,7 +250,6 @@ radio_config_known_req_name(
    RadioConfig* self,
    RADIO_CONFIG_REQ req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (!G_LIKELY(self) || self->interface_type == RADIO_INTERFACE_TYPE_HIDL) {
        switch (req) {
        case RADIO_CONFIG_REQ_SET_RESPONSE_FUNCTIONS: return "setResponseFunctions";
@@ -257,6 +258,7 @@ radio_config_known_req_name(
        RADIO_CONFIG_CALL_1_0(RADIO_CONFIG_REQ_)
        RADIO_CONFIG_CALL_1_1(RADIO_CONFIG_REQ_)
        /* 1.2 defines no new requests */
+        RADIO_CONFIG_CALL_1_3(RADIO_CONFIG_REQ_)
 #undef RADIO_CONFIG_REQ_
        case RADIO_CONFIG_REQ_ANY:
            break;
@@ -281,13 +283,13 @@ radio_config_known_resp_name(
    RadioConfig* self,
    RADIO_CONFIG_RESP resp)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (!G_LIKELY(self) || self->interface_type == RADIO_INTERFACE_TYPE_HIDL) {
        switch (resp) {
 #define RADIO_CONFIG_RESP_(req,resp,Name,NAME) \
        case RADIO_CONFIG_RESP_##NAME: return #Name "Response";
        RADIO_CONFIG_CALL_1_0(RADIO_CONFIG_RESP_)
        RADIO_CONFIG_CALL_1_1(RADIO_CONFIG_RESP_)
+        RADIO_CONFIG_CALL_1_3(RADIO_CONFIG_RESP_)
 #undef RADIO_CONFIG_RESP_
        case RADIO_CONFIG_RESP_GET_SIM_SLOTS_STATUS_1_2:
            return "getSimSlotsStatusResponse_1_2";
@@ -313,7 +315,6 @@ radio_config_known_ind_name(
    RadioConfig* self,
    RADIO_CONFIG_IND ind)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (!G_LIKELY(self) || self->interface_type == RADIO_INTERFACE_TYPE_HIDL) {
        switch (ind) {
 #define RADIO_CONFIG_IND_(code,Name,NAME) \
@@ -321,6 +322,7 @@ radio_config_known_ind_name(
        RADIO_CONFIG_IND_1_0(RADIO_CONFIG_IND_)
        /* 1.1 defines no new indications */
        RADIO_CONFIG_IND_1_2(RADIO_CONFIG_IND_)
+        /* 1.3 defines no new indications */
 #undef RADIO_CONFIG_IND_
        case RADIO_CONFIG_IND_ANY:
            break;
@@ -344,7 +346,6 @@ radio_config_req_quark(
    RadioConfig* self,
    RADIO_CONFIG_REQ req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    GQuark q = 0;

    if (req != RADIO_CONFIG_REQ_ANY) {
@@ -371,7 +372,6 @@ radio_config_resp_quark(
    RadioConfig* self,
    RADIO_CONFIG_RESP resp)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    GQuark q = 0;

    if (resp != RADIO_CONFIG_RESP_ANY) {
@@ -398,7 +398,6 @@ radio_config_ind_quark(
    RadioConfig* self,
    RADIO_CONFIG_IND ind)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    GQuark q = 0;

    if (ind != RADIO_CONFIG_IND_ANY) {
@@ -429,7 +428,6 @@ radio_config_indication(
    int* status,
    void* user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioConfig* self = THIS(user_data);
    const char* iface = gbinder_remote_request_interface(req);

@@ -475,7 +473,6 @@ radio_config_response(
    int* status,
    void* user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioConfig* self = THIS(user_data);
    const char* iface = gbinder_remote_request_interface(req);
    const RadioResponseInfo* info = NULL;
@@ -544,7 +541,6 @@ void
 radio_config_drop_binder(
    RadioConfig* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (self->indication) {
        gbinder_local_object_drop(self->indication);
        self->indication = NULL;
@@ -567,7 +563,6 @@ radio_config_died(
    GBinderRemoteObject* obj,
    void* user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioConfig* self = THIS(user_data);

    GWARN("IRadioConfig died");
@@ -588,7 +583,6 @@ radio_config_gone(
    gpointer user_data,
    GObject* dead)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    GObject** shared_instance = user_data;

    if (*shared_instance == dead) {
@@ -604,7 +598,6 @@ radio_config_create(
    GBinderRemoteObject* remote,
    const RadioConfigInterfaceDesc* desc)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioConfig* self = g_object_new(THIS_TYPE, NULL);
    GBinderLocalRequest* req;
    GBinderWriter writer;
@@ -657,7 +650,6 @@ RadioConfig*
 radio_config_new(
    void)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return radio_config_new_with_version(RADIO_CONFIG_INTERFACE_MAX);
 }

@@ -665,7 +657,6 @@ RadioConfig*
 radio_config_new_with_version(
    RADIO_CONFIG_INTERFACE max_version)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return radio_config_new_with_version_and_interface_type(max_version,
        RADIO_INTERFACE_TYPE_HIDL);
 }
@@ -675,7 +666,6 @@ radio_config_new_with_version_and_interface_type(
    RADIO_CONFIG_INTERFACE max_version,
    RADIO_INTERFACE_TYPE interface_type)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    static RadioConfig** instances = NULL;
    const RadioConfigInterfaceDesc* interfaces = NULL;
    gsize num_interfaces = 0;
@@ -757,7 +747,6 @@ RadioConfig*
 radio_config_ref(
    RadioConfig* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self)) {
        g_object_ref(self);
    }
@@ -768,7 +757,6 @@ void
 radio_config_unref(
    RadioConfig* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self)) {
        g_object_unref(self);
    }
@@ -778,7 +766,6 @@ gboolean
 radio_config_dead(
    RadioConfig* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return G_UNLIKELY(!self) || self->dead;
 }

@@ -786,7 +773,6 @@ RADIO_INTERFACE_TYPE
 radio_config_interface_type(
    RadioConfig* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return G_LIKELY(self) ? self->interface_type : RADIO_INTERFACE_TYPE_NONE;
 }

@@ -794,7 +780,6 @@ RADIO_CONFIG_INTERFACE
 radio_config_interface(
    RadioConfig* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return G_LIKELY(self) ? self->version : RADIO_CONFIG_INTERFACE_NONE;
 }

@@ -803,7 +788,6 @@ radio_config_rpc_header_size(
    RadioConfig* self,
    RADIO_CONFIG_REQ req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self)) {
        GBytes* header = gbinder_client_rpc_header(self->client, req);

@@ -819,7 +803,6 @@ radio_config_req_name(
    RadioConfig* self,
    RADIO_CONFIG_REQ req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    const char* known = radio_config_known_req_name(self, req);

    if (known) {
@@ -839,7 +822,6 @@ radio_config_resp_name(
    RadioConfig* self,
    RADIO_CONFIG_RESP resp)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    const char* known = radio_config_known_resp_name(self, resp);

    if (known) {
@@ -859,7 +841,6 @@ radio_config_ind_name(
    RadioConfig* self,
    RADIO_CONFIG_IND ind)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    const char* known = radio_config_known_ind_name(self, ind);

    if (known) {
@@ -880,7 +861,6 @@ radio_config_add_death_handler(
    RadioConfigFunc fn,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return (G_LIKELY(self) && G_LIKELY(fn)) ?
        g_signal_connect_closure_by_id(self,
             radio_config_signals[SIGNAL_DEATH], 0,
@@ -894,7 +874,6 @@ radio_config_add_request_observer(
    RadioConfigRequestObserverFunc func,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return radio_config_add_request_observer_with_priority(self,
        RADIO_OBSERVER_PRIORITY_DEFAULT, code, func, user_data);
 }
@@ -907,7 +886,6 @@ radio_config_add_request_observer_with_priority(
    RadioConfigRequestObserverFunc func,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self) && G_LIKELY(func)) {
        const guint index = radio_observer_priority_index(priority);
        const RADIO_CONFIG_SIGNAL sig = SIGNAL_OBSERVE_REQUEST_0 + index;
@@ -936,7 +914,6 @@ radio_config_add_response_observer(
    RadioConfigResponseObserverFunc func,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return radio_config_add_response_observer_with_priority(self,
        RADIO_OBSERVER_PRIORITY_DEFAULT, code, func, user_data);
 }
@@ -949,7 +926,6 @@ radio_config_add_response_observer_with_priority(
    RadioConfigResponseObserverFunc func,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self) && G_LIKELY(func)) {
        const guint index = radio_observer_priority_index(priority);
        const RADIO_CONFIG_SIGNAL sig = SIGNAL_OBSERVE_RESPONSE_0 + index;
@@ -978,7 +954,6 @@ radio_config_add_indication_observer(
    RadioConfigIndicationObserverFunc func,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return radio_config_add_indication_observer_with_priority(self,
        RADIO_OBSERVER_PRIORITY_DEFAULT, code, func, user_data);
 }
@@ -991,7 +966,6 @@ radio_config_add_indication_observer_with_priority(
    RadioConfigIndicationObserverFunc func,
    gpointer user_data) /* Since 1.4.3 */
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self) && G_LIKELY(func)) {
        const guint pi = radio_observer_priority_index(priority);
        const RADIO_CONFIG_SIGNAL sig = SIGNAL_OBSERVE_INDICATION_0 + pi;
@@ -1018,7 +992,6 @@ radio_config_remove_handler(
    RadioConfig* self,
    gulong id)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self) && G_LIKELY(id)) {
        g_signal_handler_disconnect(self, id);
    }
@@ -1030,7 +1003,6 @@ radio_config_remove_handlers(
    gulong* ids,
    int count)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    gutil_disconnect_handlers(self, ids, count);
 }

@@ -1043,7 +1015,6 @@ gboolean
 radio_config_is_dead(
    RadioBase* base)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return THIS(base)->dead;
 }

@@ -1052,7 +1023,6 @@ gboolean
 radio_config_can_submit_requests(
    RadioBase* base)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return !radio_config_is_dead(base);
 }

@@ -1062,7 +1032,6 @@ radio_config_new_request(
    RadioBase* base,
    guint32 code)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return gbinder_client_new_request2(THIS(base)->client, code);
 }

@@ -1073,7 +1042,6 @@ radio_config_send_request(
    RadioRequest* req,
    RadioBaseRequestSentFunc callback)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioConfig* self = THIS(base);
    RadioConfigCall* call = g_slice_new(RadioConfigCall);
    GQuark quark = 0;
@@ -1114,7 +1082,6 @@ radio_config_cancel_request(
    RadioBase* base,
    gulong id)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    gbinder_client_cancel(THIS(base)->client, id);
 }

@@ -1127,7 +1094,6 @@ void
 radio_config_init(
    RadioConfig* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    self->version = RADIO_CONFIG_INTERFACE_NONE;
    self->pool = gutil_idle_pool_new();
    self->req_quarks = g_hash_table_new(g_direct_hash, g_direct_equal);
@@ -1140,7 +1106,6 @@ void
 radio_config_finalize(
    GObject* object)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioConfig* self = THIS(object);

    radio_config_drop_binder(self);
@@ -1157,7 +1122,6 @@ void
 radio_config_class_init(
    RadioConfigClass* klass)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioBaseClass* base_class = RADIO_BASE_CLASS(klass);
    GObjectClass* object_class = G_OBJECT_CLASS(klass);
    GType type = G_OBJECT_CLASS_TYPE(klass);
--- a/src/radio_instance.c
+++ b/src/radio_instance.c
@@ -123,6 +123,7 @@ static GHashTable* radio_instance_table = NULL;
 #define DEFAULT_INTERFACE RADIO_INTERFACE_1_0

 static const GBinderClientIfaceInfo radio_iface_info[] = {
+    {RADIO_1_6, RADIO_1_6_REQ_LAST },
    {RADIO_1_5, RADIO_1_5_REQ_LAST },
    {RADIO_1_4, RADIO_1_4_REQ_LAST },
    {RADIO_1_3, RADIO_1_3_REQ_LAST },
@@ -133,6 +134,7 @@ static const GBinderClientIfaceInfo radio_iface_info[] = {
 G_STATIC_ASSERT(G_N_ELEMENTS(radio_iface_info) == RADIO_INTERFACE_COUNT);

 static const char* const radio_indication_ifaces[] = {
+    RADIO_INDICATION_1_6,
    RADIO_INDICATION_1_5,
    RADIO_INDICATION_1_4,
    RADIO_INDICATION_1_3,
@@ -144,6 +146,7 @@ static const char* const radio_indication_ifaces[] = {
 G_STATIC_ASSERT(G_N_ELEMENTS(radio_indication_ifaces) == RADIO_INTERFACE_COUNT + 1);

 static const char* const radio_response_ifaces[] = {
+    RADIO_RESPONSE_1_6,
    RADIO_RESPONSE_1_5,
    RADIO_RESPONSE_1_4,
    RADIO_RESPONSE_1_3,
@@ -174,6 +177,7 @@ typedef struct radio_interface_desc {
        RADIO_REQ_SET_RESPONSE_FUNCTIONS

 static const RadioInterfaceDesc radio_interfaces[] = {
+   { RADIO_INTERFACE_DESC(1_6) },
   { RADIO_INTERFACE_DESC(1_5) },
   { RADIO_INTERFACE_DESC(1_4) },
   { RADIO_INTERFACE_DESC(1_3) },
@@ -796,7 +800,7 @@ radio_instance_create(
    RadioInstance* self = NULL;
    GBinderServiceManager* sm = gbinder_servicemanager_new(dev);
    const RadioInterfaceDesc* interfaces = NULL;
-    gsize num_interfaces = 0;
+    gsize i, num_interfaces = 0;

    if (!sm) {
        GERR_("Failed to get ServiceManager on %s", dev);
@@ -812,7 +816,7 @@ radio_instance_create(
        num_interfaces = 1;
    }

-    for (guint i = 0; i < num_interfaces && !self; i++) {
+    for (i = 0; i < num_interfaces && !self; i++) {
        const RadioInterfaceDesc* desc = interfaces + i;

        if (desc->version <= max_version) {
@@ -1021,7 +1025,6 @@ radio_instance_new_with_modem_slot_and_version(
    int slot,
    RADIO_INTERFACE version) /* Since 1.2.1 */
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return radio_instance_new_with_modem_slot_version_and_interface(
        dev, name, modem, slot, version, RADIO_AIDL_INTERFACE_NONE);
 }
@@ -1035,7 +1038,6 @@ radio_instance_new_with_modem_slot_version_and_interface(
    RADIO_INTERFACE version,
    RADIO_AIDL_INTERFACE aidl_interface) /* Since 1.6.0 */
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (dev && dev[0] && name && name[0]) {
        /* HIDL and AIDL would use different binder devices */
        char* key = radio_instance_make_key(dev, name, version, aidl_interface);
@@ -1071,7 +1073,6 @@ radio_instance_get(
    const char* dev,
    const char* name)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return radio_instance_get_with_version(dev, name, DEFAULT_INTERFACE);
 }

@@ -1081,7 +1082,6 @@ radio_instance_get_with_interface(
    const char* name,
    RADIO_INTERFACE version) /* 1.2.1, deprecated */
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return radio_instance_get_with_version(dev, name, version);
 }

@@ -1091,7 +1091,6 @@ radio_instance_get_with_version(
    const char* name,
    RADIO_INTERFACE version) /* Since 1.2.2 */
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioInstance* self = NULL;

    if (dev && dev[0] && name && name[0] && radio_instance_table) {
@@ -1107,7 +1106,6 @@ RadioInstance* const*
 radio_instance_get_all(
    void)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (radio_instance_table) {
        /* If the table exists, it must be non-empty */
        const guint n = g_hash_table_size(radio_instance_table);
@@ -1133,7 +1131,6 @@ RadioInstance*
 radio_instance_ref(
    RadioInstance* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self)) {
        g_object_ref(RADIO_INSTANCE(self));
        return self;
@@ -1146,7 +1143,6 @@ void
 radio_instance_unref(
    RadioInstance* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self)) {
        g_object_unref(RADIO_INSTANCE(self));
    }
@@ -1157,7 +1153,6 @@ radio_instance_rpc_header_size(
    RadioInstance* self,
    RADIO_REQ req) /* Since 1.4.3 */
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self)) {
        RadioInstancePriv* priv = self->priv;
        GBytes* header = gbinder_client_rpc_header(priv->client, req);
@@ -1174,7 +1169,6 @@ radio_instance_req_name(
    RadioInstance* self,
    RADIO_REQ req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    const char* known = radio_req_name2(self, req);

    if (known) {
@@ -1194,7 +1188,6 @@ radio_instance_resp_name(
    RadioInstance* self,
    RADIO_RESP resp)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    const char* known = radio_resp_name2(self, resp);

    if (known) {
@@ -1214,7 +1207,6 @@ radio_instance_ind_name(
    RadioInstance* self,
    RADIO_IND ind)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    const char* known = radio_ind_name2(self, ind);

    if (known) {
@@ -1233,7 +1225,6 @@ gboolean
 radio_instance_is_dead(
    RadioInstance* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return G_UNLIKELY(!self) || self->dead;
 }

@@ -1241,7 +1232,6 @@ gboolean
 radio_instance_ack(
    RadioInstance* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self)) {
        GBinderClient* client = self->priv->client;
        const RADIO_REQ code = RADIO_REQ_RESPONSE_ACKNOWLEDGEMENT;
@@ -1257,7 +1247,6 @@ radio_instance_new_request(
    RadioInstance* self,
    RADIO_REQ code)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self)) {
        return gbinder_client_new_request2(self->priv->client, code);
    }
@@ -1270,7 +1259,6 @@ radio_instance_send_request_sync(
    RADIO_REQ code,
    GBinderLocalRequest* args)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self)) {
        GBinderClient* client = self->priv->client;

@@ -1285,7 +1273,6 @@ radio_instance_set_enabled(
    RadioInstance* self,
    gboolean enabled) /* Since 1.0.7 */
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self) && self->enabled != enabled) {
        self->enabled = enabled;
        GDEBUG("%s %sabled", self->slot, enabled ? "en" : "dis");
@@ -1300,7 +1287,6 @@ radio_instance_add_request_observer(
    RadioRequestObserverFunc func,
    gpointer user_data) /* Since 1.4.3 */
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return radio_instance_add_request_observer_with_priority(self,
        RADIO_OBSERVER_PRIORITY_DEFAULT, code, func, user_data);
 }
@@ -1313,7 +1299,6 @@ radio_instance_add_request_observer_with_priority(
    RadioRequestObserverFunc func,
    gpointer user_data) /* Since 1.4.3 */
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self) && G_LIKELY(func)) {
        const guint index = radio_observer_priority_index(priority);
        const RADIO_INSTANCE_SIGNAL sig = SIGNAL_OBSERVE_REQUEST_0 + index;
@@ -1343,7 +1328,6 @@ radio_instance_add_response_observer(
    RadioResponseObserverFunc func,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return radio_instance_add_response_observer_with_priority(self,
        RADIO_OBSERVER_PRIORITY_DEFAULT, code, func, user_data);
 }
@@ -1356,7 +1340,6 @@ radio_instance_add_response_observer_with_priority(
    RadioResponseObserverFunc func,
    gpointer user_data) /* Since 1.4.3 */
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self) && G_LIKELY(func)) {
        const guint index = radio_observer_priority_index(priority);
        const RADIO_INSTANCE_SIGNAL sig = SIGNAL_OBSERVE_RESPONSE_0 + index;
@@ -1386,7 +1369,6 @@ radio_instance_add_indication_observer(
    RadioIndicationObserverFunc func,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return radio_instance_add_indication_observer_with_priority(self,
        RADIO_OBSERVER_PRIORITY_DEFAULT, code, func, user_data);
 }
@@ -1399,7 +1381,6 @@ radio_instance_add_indication_observer_with_priority(
    RadioIndicationObserverFunc func,
    gpointer user_data) /* Since 1.4.3 */
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self) && G_LIKELY(func)) {
        const guint index = radio_observer_priority_index(priority);
        const RADIO_INSTANCE_SIGNAL sig = SIGNAL_OBSERVE_INDICATION_0 + index;
@@ -1429,7 +1410,6 @@ radio_instance_add_response_handler(
    RadioResponseHandlerFunc func,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return (G_LIKELY(self) && G_LIKELY(func)) ?
        g_signal_connect_closure_by_id(self,
            radio_instance_signals[SIGNAL_HANDLE_RESPONSE],
@@ -1444,7 +1424,6 @@ radio_instance_add_indication_handler(
    RadioIndicationHandlerFunc func,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return (G_LIKELY(self) && G_LIKELY(func)) ?
        g_signal_connect_closure_by_id(self,
            radio_instance_signals[SIGNAL_HANDLE_INDICATION],
@@ -1458,7 +1437,6 @@ radio_instance_add_ack_handler(
    RadioAckFunc func,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return (G_LIKELY(self) && G_LIKELY(func)) ? g_signal_connect(self,
        SIGNAL_ACK_NAME, G_CALLBACK(func), user_data) : 0;
 }
@@ -1469,7 +1447,6 @@ radio_instance_add_death_handler(
    RadioInstanceFunc func,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return (G_LIKELY(self) && G_LIKELY(func)) ? g_signal_connect(self,
        SIGNAL_DEATH_NAME, G_CALLBACK(func), user_data) : 0;
 }
@@ -1480,7 +1457,6 @@ radio_instance_add_enabled_handler(
    RadioInstanceFunc func,
    gpointer user_data) /* Since 1.0.7 */
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return (G_LIKELY(self) && G_LIKELY(func)) ? g_signal_connect(self,
        SIGNAL_ENABLED_NAME, G_CALLBACK(func), user_data) : 0;
 }
@@ -1491,7 +1467,6 @@ radio_instance_add_connected_handler(
    RadioInstanceFunc func,
    gpointer user_data) /* Since 1.4.3 */
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return (G_LIKELY(self) && G_LIKELY(func)) ? g_signal_connect(self,
        SIGNAL_CONNECTED_NAME, G_CALLBACK(func), user_data) : 0;
 }
@@ -1501,7 +1476,6 @@ radio_instance_remove_handler(
    RadioInstance* self,
    gulong id)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self) && G_LIKELY(id)) {
        g_signal_handler_disconnect(self, id);
    }
@@ -1513,7 +1487,6 @@ radio_instance_remove_handlers(
    gulong* ids,
    int count)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    gutil_disconnect_handlers(self, ids, count);
 }

@@ -1526,7 +1499,6 @@ void
 radio_instance_init(
    RadioInstance* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioInstancePriv* priv = G_TYPE_INSTANCE_GET_PRIVATE
        (self, RADIO_TYPE_INSTANCE, RadioInstancePriv);

@@ -1542,7 +1514,6 @@ void
 radio_instance_finalize(
    GObject* object)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioInstance* self = RADIO_INSTANCE(object);
    RadioInstancePriv* priv = self->priv;

@@ -1564,7 +1535,6 @@ void
 radio_instance_class_init(
    RadioInstanceClass* klass)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    GObjectClass* object_class = G_OBJECT_CLASS(klass);
    GType type = G_OBJECT_CLASS_TYPE(klass);

--- a/src/radio_log.h
+++ b/src/radio_log.h
@@ -41,8 +41,6 @@

 #define GLOG_MODULE_NAME GBINDER_RADIO_LOG_MODULE
 #include <gutil_log.h>
-#define DBG(fmt, ...) \
-    gutil_log(GLOG_MODULE_CURRENT, GLOG_LEVEL_ALWAYS, "gbinder-radio:"fmt, ##__VA_ARGS__)

 #endif /* RADIO_LOG_H */

--- a/src/radio_registry.c
+++ b/src/radio_registry.c
@@ -36,7 +36,6 @@

 #include "radio_registry_p.h"
 #include "radio_instance.h"
-#include "radio_log.h"

 #include <gutil_misc.h>

@@ -72,7 +71,6 @@ void
 radio_registry_instance_added(
    RadioInstance* radio)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioRegistry* self = radio_registry_instance;

    if (self) {
@@ -87,7 +85,6 @@ void
 radio_registry_instance_removed(
    const char* key)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioRegistry* self = radio_registry_instance;

    if (self) {
@@ -106,7 +103,6 @@ RadioRegistry*
 radio_registry_new(
    void)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (radio_registry_instance) {
        radio_registry_ref(radio_registry_instance);
    } else {
@@ -122,7 +118,6 @@ RadioRegistry*
 radio_registry_ref(
    RadioRegistry* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self)) {
        g_object_ref(RADIO_REGISTRY(self));
        return self;
@@ -135,7 +130,6 @@ void
 radio_registry_unref(
    RadioRegistry* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self)) {
        g_object_unref(RADIO_REGISTRY(self));
    }
@@ -148,7 +142,6 @@ radio_registry_add_instance_added_handler(
    RadioRegistryInstanceFunc func,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self) && G_LIKELY(func)) {
        return g_signal_connect_closure_by_id(self,
            radio_registry_signals[SIGNAL_INSTANCE_ADDED],
@@ -165,7 +158,6 @@ radio_registry_add_instance_removed_handler(
    RadioRegistryStrFunc func,
    gpointer user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self) && G_LIKELY(func)) {
        return g_signal_connect_closure_by_id(self,
            radio_registry_signals[SIGNAL_INSTANCE_REMOVED],
@@ -180,7 +172,6 @@ radio_registry_remove_handler(
    RadioRegistry* self,
    gulong id)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self) && G_LIKELY(id)) {
        g_signal_handler_disconnect(self, id);
    }
@@ -192,7 +183,6 @@ radio_registry_remove_handlers(
    gulong* ids,
    int count)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    gutil_disconnect_handlers(self, ids, count);
 }

@@ -205,7 +195,6 @@ void
 radio_registry_init(
    RadioRegistry* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
 }

 static
@@ -213,7 +202,6 @@ void
 radio_registry_class_init(
    RadioRegistryClass* klass)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    radio_registry_signals[SIGNAL_INSTANCE_ADDED] =
        g_signal_new(SIGNAL_INSTANCE_ADDED_NAME, G_OBJECT_CLASS_TYPE(klass),
            G_SIGNAL_RUN_FIRST | G_SIGNAL_DETAILED, 0, NULL, NULL, NULL,
--- a/src/radio_request.c
+++ b/src/radio_request.c
@@ -70,7 +70,6 @@ void
 radio_request_object_cancel(
    RadioRequestObject* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioRequest* req = &self->pub;

    radio_base_cancel_request(req->object, req);
@@ -87,7 +86,6 @@ void
 radio_request_free(
    RadioRequestObject* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioRequest* req = &self->pub;

    GVERBOSE_("%u (%08x) %p", req->code, req->serial, req);
@@ -117,7 +115,6 @@ void
 radio_request_object_unref(
    RadioRequestObject* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(self)) {
        GASSERT(self->refcount > 0);
        if (g_atomic_int_dec_and_test(&self->refcount)) {
@@ -136,7 +133,6 @@ radio_request_default_retry(
    const GBinderReader* reader,
    void* user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (status != RADIO_TX_STATUS_OK) {
        GVERBOSE_("req %p %u (%08x) status %d", req, req->code, req->serial,
            status);
@@ -161,7 +157,6 @@ radio_request_object_new(
    GDestroyNotify destroy,
    void* user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioRequestObject* self = g_slice_new0(RadioRequestObject);
    RadioRequest* req = &self->pub;
    GBinderWriter tmp;
@@ -197,7 +192,6 @@ void
 radio_request_unref_func(
    gpointer req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    radio_request_object_unref(radio_request_cast(req));
 }

@@ -206,7 +200,6 @@ radio_request_update_serial(
    RadioRequest* req,
    guint32 serial)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    GBinderWriter writer;

    gbinder_local_request_init_writer(req->args, &writer);
@@ -227,7 +220,6 @@ radio_request_new(
    GDestroyNotify destroy,
    void* user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return client ? radio_request_object_new(RADIO_BASE(client), NULL,
        code, writer, (RadioRequestGenericCompleteFunc) complete,
        destroy, user_data) : NULL;
@@ -242,7 +234,6 @@ radio_request_new2(
    GDestroyNotify destroy,
    void* user_data)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return group ? radio_request_object_new(RADIO_BASE(group->client), group,
        code, writer, (RadioRequestGenericCompleteFunc) complete,
        destroy, user_data) : NULL;
@@ -257,7 +248,6 @@ radio_config_request_new(
    GDestroyNotify destroy,
    void* user_data) /* Since 1.4.6 */
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return config ? radio_request_object_new(RADIO_BASE(config), NULL,
        code, writer, (RadioRequestGenericCompleteFunc) complete,
        destroy, user_data) : NULL;
@@ -267,7 +257,6 @@ RadioRequest*
 radio_request_ref(
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioRequestObject* self = radio_request_cast(req);

    if (G_LIKELY(self)) {
@@ -281,7 +270,6 @@ void
 radio_request_unref(
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    radio_request_object_unref(radio_request_cast(req));
 }

@@ -290,7 +278,6 @@ radio_request_set_blocking(
    RadioRequest* req,
    gboolean blocking)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(req)) {
        req->blocking = blocking;
    }
@@ -301,7 +288,6 @@ radio_request_set_timeout(
    RadioRequest* req,
    guint ms)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(req) && req->timeout_ms != ms) {
        RadioBase* base = req->object;

@@ -321,7 +307,6 @@ radio_request_set_retry(
    guint delay_ms,     /* Delay before each retry, in milliseconds */
    int max_count)      /* Negative count to keep retrying indefinitely */
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(req)) {
        req->retry_delay_ms = delay_ms;
        req->max_retries = max_count;
@@ -333,7 +318,6 @@ radio_request_set_retry_func(
    RadioRequest* req,
    RadioRequestRetryFunc retry)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(req)) {
        req->retry = retry ? retry : radio_request_default_retry;
    }
@@ -343,7 +327,6 @@ gboolean
 radio_request_submit(
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (req && req->object && radio_base_submit_request(req->object, req)) {
        radio_request_cast(req)->flags |= RADIO_REQUEST_FLAG_SUBMITTED;
        return TRUE;
@@ -355,7 +338,6 @@ gboolean
 radio_request_retry(
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return req && req->object && radio_base_retry_request(req->object, req);
 }

@@ -363,7 +345,6 @@ void
 radio_request_cancel(
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioRequestObject* self = radio_request_cast(req);

    if (G_LIKELY(self)) {
@@ -376,7 +357,6 @@ void
 radio_request_drop(
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioRequestObject* self = radio_request_cast(req);

    if (G_LIKELY(self)) {
@@ -390,7 +370,6 @@ void*
 radio_request_user_data(
    RadioRequest* req) /* Since 1.4.11 */
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return G_LIKELY(req) ? req->user_data : NULL;
 }

--- a/src/radio_request_group.c
+++ b/src/radio_request_group.c
@@ -60,7 +60,6 @@ void
 radio_request_group_unlink_func(
    gpointer req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    ((RadioRequest*)req)->group = NULL;
 }

@@ -69,7 +68,6 @@ void
 radio_request_group_free(
    RadioRequestGroupObject* self)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioRequestGroup* group = &self->pub;

    radio_base_unblock(RADIO_BASE(group->client), group);
@@ -87,7 +85,6 @@ radio_request_group_add(
    RadioRequestGroup* group,
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioRequestGroupObject* self = radio_request_group_cast(group);

    /* Request is never NULL but the group may be */
@@ -102,7 +99,6 @@ radio_request_group_remove(
    RadioRequestGroup* group,
    RadioRequest* req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioRequestGroupObject* self = radio_request_group_cast(group);

    /* Request is never NULL but the group may be */
@@ -119,7 +115,6 @@ RadioRequestGroup*
 radio_request_group_new(
    RadioClient* client)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (G_LIKELY(client)) {
        RadioRequestGroupObject* self = g_slice_new0(RadioRequestGroupObject);
        RadioRequestGroup* group = &self->pub;
@@ -137,7 +132,6 @@ RadioRequestGroup*
 radio_request_group_ref(
    RadioRequestGroup* group)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioRequestGroupObject* self = radio_request_group_cast(group);

    if (G_LIKELY(self)) {
@@ -151,7 +145,6 @@ void
 radio_request_group_unref(
    RadioRequestGroup* group)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioRequestGroupObject* self = radio_request_group_cast(group);

    if (G_LIKELY(self)) {
@@ -166,7 +159,6 @@ void
 radio_request_group_cancel(
    RadioRequestGroup* group)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    RadioRequestGroupObject* self = radio_request_group_cast(group);

    if (G_LIKELY(self)) {
@@ -202,7 +194,6 @@ RADIO_BLOCK
 radio_request_group_block_status(
    RadioRequestGroup* group)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return group ? radio_base_block_status(RADIO_BASE(group->client), group) :
        RADIO_BLOCK_NONE;
 }
@@ -211,7 +202,6 @@ RADIO_BLOCK
 radio_request_group_block(
    RadioRequestGroup* group)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return group ? radio_base_block(RADIO_BASE(group->client), group) :
        RADIO_BLOCK_NONE;
 }
@@ -220,7 +210,6 @@ void
 radio_request_group_unblock(
    RadioRequestGroup* group)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (group) {
        radio_base_unblock(RADIO_BASE(group->client), group);
    }
--- a/src/radio_util.c
+++ b/src/radio_util.c
@@ -44,7 +44,6 @@ guint
 radio_observer_priority_index(
    RADIO_OBSERVER_PRIORITY priority)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (priority < RADIO_OBSERVER_PRIORITY_LOWEST) {
        return 0;
    } else if (priority > RADIO_OBSERVER_PRIORITY_HIGHEST) {
@@ -58,7 +57,6 @@ const char*
 radio_req_name(
    RADIO_REQ req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return radio_req_name2(NULL, req);
 }

@@ -67,7 +65,6 @@ radio_req_name2(
    RadioInstance* instance,
    RADIO_REQ req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (!G_LIKELY(instance) || instance->interface_type == RADIO_INTERFACE_TYPE_HIDL) {
        switch (req) {
        case RADIO_REQ_SET_RESPONSE_FUNCTIONS:   return "setResponseFunctions";
@@ -82,14 +79,17 @@ radio_req_name2(
        RADIO_CALL_1_3(RADIO_REQ_)
        RADIO_CALL_1_4_(RADIO_REQ__)
        RADIO_CALL_1_5_(RADIO_REQ__)
+        RADIO_CALL_1_6_(RADIO_REQ__)
 #undef RADIO_REQ_
 #undef RADIO_REQ__
-        case RADIO_REQ_START_NETWORK_SCAN_1_2:     return "startNetworkScan_1_2";
-        case RADIO_REQ_SET_INDICATION_FILTER_1_2:  return "setIndicationFilter_1_2";
-        case RADIO_REQ_SETUP_DATA_CALL_1_2:        return "setupDataCall_1_2";
-        case RADIO_REQ_DEACTIVATE_DATA_CALL_1_2:   return "deactivateDataCall_1_2";
-        case RADIO_REQ_SET_INITIAL_ATTACH_APN_1_4: return "setInitialAttachApn_1_4";
-        case RADIO_REQ_SET_DATA_PROFILE_1_4:       return "setDataProfile_1_4";
+        case RADIO_REQ_START_NETWORK_SCAN_1_2:                   return "startNetworkScan_1_2";
+        case RADIO_REQ_SET_INDICATION_FILTER_1_2:                return "setIndicationFilter_1_2";
+        case RADIO_REQ_SETUP_DATA_CALL_1_2:                      return "setupDataCall_1_2";
+        case RADIO_REQ_DEACTIVATE_DATA_CALL_1_2:                 return "deactivateDataCall_1_2";
+        case RADIO_REQ_SET_INITIAL_ATTACH_APN_1_4:               return "setInitialAttachApn_1_4";
+        case RADIO_REQ_SET_DATA_PROFILE_1_4:                     return "setDataProfile_1_4";
+        case RADIO_REQ_EMERGENCY_DIAL_1_6:                       return "emergencyDial_1_6";
+        case RADIO_REQ_SET_CARRIER_INFO_FOR_IMSI_ENCRYPTION_1_6: return "setCarrierInfoForImsiEncryption_1_6";
        case RADIO_REQ_ANY:
            break;
        }
@@ -178,7 +178,6 @@ const char*
 radio_resp_name(
    RADIO_RESP resp)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return radio_resp_name2(NULL, resp);
 }

@@ -187,7 +186,6 @@ radio_resp_name2(
    RadioInstance* instance,
    RADIO_RESP resp)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (!G_LIKELY(instance) || instance->interface_type == RADIO_INTERFACE_TYPE_HIDL) {
        switch (resp) {
        case RADIO_RESP_ACKNOWLEDGE_REQUEST: return "acknowledgeRequest";
@@ -201,6 +199,7 @@ radio_resp_name2(
        RADIO_CALL_1_3(RADIO_RESP_)
        RADIO_CALL_1_4_(RADIO_RESP__)
        RADIO_CALL_1_5_(RADIO_RESP__)
+        RADIO_CALL_1_6_(RADIO_RESP__)
 #undef RADIO_RESP_
 #undef RADIO_RESP__
        case RADIO_RESP_GET_CELL_INFO_LIST_1_2:
@@ -310,7 +309,6 @@ const char*
 radio_ind_name(
    RADIO_IND ind)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    return radio_ind_name2(NULL, ind);
 }

@@ -319,7 +317,6 @@ radio_ind_name2(
    RadioInstance* instance,
    RADIO_IND ind)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    if (!G_LIKELY(instance) || instance->interface_type == RADIO_INTERFACE_TYPE_HIDL) {
        switch (ind) {
 #define RADIO_IND_(code,Name,NAME) \
@@ -329,6 +326,7 @@ radio_ind_name2(
        RADIO_EVENT_1_2(RADIO_IND_)
        RADIO_EVENT_1_4(RADIO_IND_)
        RADIO_EVENT_1_5(RADIO_IND_)
+        RADIO_EVENT_1_6(RADIO_IND_)
 #undef RADIO_IND_
        case RADIO_IND_ANY:
            break;
@@ -415,7 +413,6 @@ RADIO_RESP
 radio_req_resp(
    RADIO_REQ req)
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    switch (req) {
 #define RADIO_REQ_RESP_(req,resp,Name,NAME) \
    case RADIO_REQ_##NAME: return RADIO_RESP_##NAME;
@@ -427,6 +424,7 @@ radio_req_resp(
    RADIO_CALL_1_3(RADIO_REQ_RESP_)
    RADIO_CALL_1_4_(RADIO_REQ_RESP__)
    RADIO_CALL_1_5_(RADIO_REQ_RESP__)
+    RADIO_CALL_1_6_(RADIO_REQ_RESP__)
 #undef RADIO_REQ_RESP_
 #undef RADIO_REQ_RESP__
    case RADIO_REQ_SETUP_DATA_CALL_1_2:
@@ -441,6 +439,10 @@ radio_req_resp(
        return RADIO_RESP_SET_DATA_PROFILE;
    case RADIO_REQ_SET_INDICATION_FILTER_1_2:
        return RADIO_RESP_SET_INDICATION_FILTER;
+    case RADIO_REQ_EMERGENCY_DIAL_1_6:
+        return RADIO_RESP_EMERGENCY_DIAL;
+    case RADIO_REQ_SET_CARRIER_INFO_FOR_IMSI_ENCRYPTION_1_6:
+        return RADIO_RESP_SET_CARRIER_INFO_FOR_IMSI_ENCRYPTION;

    /*
     * All these still need to be listed here to ensure a compilation
@@ -463,7 +465,6 @@ radio_req_resp2(
    RADIO_REQ req,
    RADIO_INTERFACE iface) /* Since 1.4.5 */
 {
-    DBG("func:%s,line:%d,file:%s", __func__, __LINE__, __FILE__);
    switch (req) {
    /*
     * Requests expecting a response from a previous version of the
@@ -479,6 +480,10 @@ radio_req_resp2(
        return RADIO_RESP_SET_INITIAL_ATTACH_APN;
    case RADIO_REQ_SET_DATA_PROFILE_1_4:
        return RADIO_RESP_SET_DATA_PROFILE;
+    case RADIO_REQ_EMERGENCY_DIAL_1_6:
+        return RADIO_RESP_EMERGENCY_DIAL;
+    case RADIO_REQ_SET_CARRIER_INFO_FOR_IMSI_ENCRYPTION_1_6:
+        return RADIO_RESP_SET_CARRIER_INFO_FOR_IMSI_ENCRYPTION;
    case RADIO_REQ_SET_INDICATION_FILTER_1_2:
 /* case RADIO_REQ_SET_INDICATION_FILTER_1_5: */
        return RADIO_RESP_SET_INDICATION_FILTER;
@@ -507,6 +512,7 @@ radio_req_resp2(
        case RADIO_INTERFACE_1_4:
            return RADIO_RESP_GET_ICC_CARD_STATUS_1_4;
        case RADIO_INTERFACE_1_5:
+        case RADIO_INTERFACE_1_6:
            return RADIO_RESP_GET_ICC_CARD_STATUS_1_5;
        case RADIO_INTERFACE_NONE:
        case RADIO_INTERFACE_COUNT:
@@ -520,7 +526,6 @@ radio_req_resp2(
     * getCellInfoListResponse_1_2
     * getCellInfoListResponse_1_4
     * getCellInfoListResponse_1_5 <= the last one
-     * getCellInfoList_1_6
     */
    case RADIO_REQ_GET_CELL_INFO_LIST:
        switch (iface) {
@@ -540,10 +545,9 @@ radio_req_resp2(
        return RADIO_RESP_NONE;

    /*
-     * getCurrentCalls{
+     * getCurrentCalls
     * getCurrentCallsResponse
     * getCurrentCallsResponse_1_2 <= the last one
-     * getCurrentCalls_1_6
     */
    case RADIO_REQ_GET_CURRENT_CALLS:
        switch (iface) {
@@ -561,7 +565,6 @@ radio_req_resp2(
     * getSignalStrength
     * getSignalStrengthResponse
     * getSignalStrengthResponse_1_2 <= the last one
-     * getSignalStrength_1_4
     */
    case RADIO_REQ_GET_SIGNAL_STRENGTH:
        switch (iface) {
@@ -579,7 +582,6 @@ radio_req_resp2(
     * getVoiceRegistrationState
     * getVoiceRegistrationStateResponse
     * getVoiceRegistrationStateResponse_1_2 <= the last one
-     * getVoiceRegistrationState_1_5
     */
    case RADIO_REQ_GET_VOICE_REGISTRATION_STATE:
        switch (iface) {
@@ -598,7 +600,6 @@ radio_req_resp2(
     * getDataRegistrationStateResponse
     * getDataRegistrationStateResponse_1_2
     * getDataRegistrationStateResponse_1_4 <= the last one
-     * getDataRegistrationState_1_5
     */
    case RADIO_REQ_GET_DATA_REGISTRATION_STATE:
        switch (iface) {
@@ -620,7 +621,6 @@ radio_req_resp2(
     * getDataCallListResponse
     * getDataCallListResponse_1_4
     * getDataCallListResponse_1_5 <= the last one
-     * getDataCallList_1_6
     */
    case RADIO_REQ_GET_DATA_CALL_LIST:
        switch (iface) {
--- a/unit/unit_config/unit_config.c
+++ b/unit/unit_config/unit_config.c
@@ -52,12 +52,14 @@ static const GBinderClientIfaceInfo radio_config_ind_iface_info[] = {
 };

 static const GBinderClientIfaceInfo radio_config_resp_iface_info[] = {
+    {RADIO_CONFIG_RESPONSE_1_3, RADIO_CONFIG_1_3_RESP_LAST },
    {RADIO_CONFIG_RESPONSE_1_2, RADIO_CONFIG_1_2_RESP_LAST },
    {RADIO_CONFIG_RESPONSE_1_1, RADIO_CONFIG_1_1_RESP_LAST },
    {RADIO_CONFIG_RESPONSE_1_0, RADIO_CONFIG_1_0_RESP_LAST }
 };

 static const char* const radio_config_req_ifaces[] = {
+    RADIO_CONFIG_1_3,
    RADIO_CONFIG_1_2,
    RADIO_CONFIG_1_1,
    RADIO_CONFIG_1_0,
@@ -67,7 +69,8 @@ static const char* const radio_config_req_ifaces[] = {
 static const char* const radio_config_fqnames[] = {
    RADIO_CONFIG_1_0_FQNAME,
    RADIO_CONFIG_1_1_FQNAME,
-    RADIO_CONFIG_1_2_FQNAME
+    RADIO_CONFIG_1_2_FQNAME,
+    RADIO_CONFIG_1_3_FQNAME
 };

 static
@@ -132,6 +135,7 @@ test_config_req_resp(
    case RADIO_CONFIG_REQ_##NAME: return RADIO_CONFIG_RESP_##NAME;
    RADIO_CONFIG_CALL_1_0(REQ_RESP_)
    RADIO_CONFIG_CALL_1_1(REQ_RESP_)
+    RADIO_CONFIG_CALL_1_3(REQ_RESP_)
 #undef REQ_RESP_
    case RADIO_CONFIG_REQ_SET_RESPONSE_FUNCTIONS:
        return RADIO_CONFIG_RESP_NONE;
@@ -410,7 +414,7 @@ test_name(
    void)
 {
    TestCommon test;
-    RadioConfig* client = test_common_init(&test, RADIO_CONFIG_INTERFACE_1_1);
+    RadioConfig* client = test_common_init(&test, RADIO_CONFIG_INTERFACE_1_3);

    g_assert_cmpstr(radio_config_req_name(client,
        RADIO_CONFIG_REQ_SET_RESPONSE_FUNCTIONS), == ,
@@ -421,6 +425,9 @@ test_name(
    g_assert_cmpstr(radio_config_req_name(client,
        RADIO_CONFIG_REQ_GET_PHONE_CAPABILITY), == ,
        "getPhoneCapability");
+    g_assert_cmpstr(radio_config_req_name(client,
+        RADIO_CONFIG_REQ_GET_HAL_DEVICE_CAPABILITIES), == ,
+        "getHalDeviceCapabilities");
    g_assert_cmpstr(radio_config_req_name(client,
        (RADIO_CONFIG_REQ)123), == ,
        "123");
@@ -431,6 +438,9 @@ test_name(
    g_assert_cmpstr(radio_config_resp_name(client,
        RADIO_CONFIG_RESP_GET_PHONE_CAPABILITY), == ,
        "getPhoneCapabilityResponse");
+    g_assert_cmpstr(radio_config_resp_name(client,
+        RADIO_CONFIG_RESP_GET_HAL_DEVICE_CAPABILITIES), == ,
+        "getHalDeviceCapabilitiesResponse");
    g_assert_cmpstr(radio_config_resp_name(client,
        (RADIO_CONFIG_RESP)1234), == ,
        "1234");
--- a/unit/unit_util/unit_util.c
+++ b/unit/unit_util/unit_util.c
@@ -72,6 +72,8 @@ test_req_name(
        "startNetworkScan_1_4");
    g_assert_cmpstr(radio_req_name(RADIO_REQ_START_NETWORK_SCAN_1_5),==,
        "startNetworkScan_1_5");
+    g_assert_cmpstr(radio_req_name(RADIO_REQ_START_HANDOVER),==,
+        "startHandover");
 }

 /*==========================================================================*
@@ -101,6 +103,8 @@ test_resp_name(
        "startNetworkScanResponse_1_4");
    g_assert_cmpstr(radio_resp_name(RADIO_RESP_START_NETWORK_SCAN_1_5),==,
        "startNetworkScanResponse_1_5");
+    g_assert_cmpstr(radio_resp_name(RADIO_RESP_START_HANDOVER),==,
+        "startHandoverResponse");
 }

 /*==========================================================================*
@@ -124,6 +128,8 @@ test_ind_name(
        "currentEmergencyNumberList");
    g_assert_cmpstr(radio_ind_name(RADIO_IND_REGISTRATION_FAILED),==,
        "registrationFailed");
+    g_assert_cmpstr(radio_ind_name(RADIO_IND_UNTHROTTLE_APN),==,
+        "unthrottleApn");
 }

 /*==========================================================================*
@@ -155,7 +161,8 @@ test_req_resp(
          RADIO_RESP_SET_SIGNAL_STRENGTH_REPORTING_CRITERIA },
        { RADIO_REQ_SET_SYSTEM_SELECTION_CHANNELS,
          RADIO_RESP_SET_SYSTEM_SELECTION_CHANNELS },
-        { RADIO_REQ_EMERGENCY_DIAL, RADIO_RESP_EMERGENCY_DIAL }
+        { RADIO_REQ_EMERGENCY_DIAL, RADIO_RESP_EMERGENCY_DIAL },
+        { RADIO_REQ_START_HANDOVER, RADIO_RESP_START_HANDOVER }
    };

    int i;
@@ -234,6 +241,8 @@ test_req_resp2(
          RADIO_RESP_GET_ICC_CARD_STATUS_1_4 },
        { RADIO_REQ_GET_ICC_CARD_STATUS, RADIO_INTERFACE_1_5,
          RADIO_RESP_GET_ICC_CARD_STATUS_1_5 },
+        { RADIO_REQ_GET_ICC_CARD_STATUS, RADIO_INTERFACE_1_6,
+          RADIO_RESP_GET_ICC_CARD_STATUS_1_5 },
        { RADIO_REQ_GET_ICC_CARD_STATUS, RADIO_INTERFACE_COUNT,
          RADIO_RESP_NONE },
        { RADIO_REQ_GET_ICC_CARD_STATUS, RADIO_INTERFACE_NONE,
Author	SHA1	Message	Date
Matti Lehtimäki	9ea472ec8f	[gbinder-radio] Add support for IRadio@1.6. JB#63650	2025-08-24 22:17:12 +03:00
Matti Lehtimäki	f5b4d12574	[gbinder-radio] Add support for IRadioConfig@1.3. JB#63650	2025-08-24 19:16:02 +03:00
Slava Monich	98865d72ba	Merge pull request #29 from monich/fix_loop Fix compilation error	2024-10-28 18:18:05 +02:00
Slava Monich	7b40341c01	[gbinder-radio] Fix compilation error. JB#61702 src/radio_instance.c: In function 'radio_instance_create': src/radio_instance.c:815:5: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (guint i = 0; i < num_interfaces && !self; i++) { ^ src/radio_instance.c:815:5: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code	2024-10-28 02:29:51 +02:00
				`@@ -1 +0,0 @@`
				`debian/tmp/@LIBDIR@/libgbinder-radio.so.* @LIBDIR@`