libsecril-client: Use the correct incall audio paths

The modems used in recent Samsung devices use different paths
than older devices apparently.

These values were extracted from hexdumps at the correct data
positions from the device specific libsecril-client.so blobs.

Change-Id: I0547cb1de40130843fee3f1310e1e6aed95195c7

ril/libsecril-client/Android.mk

@@ -18,6 +18,9 @@ LOCAL_CFLAGS :=
 ifeq ($(TARGET_BOARD_PLATFORM),exynos4)
 LOCAL_CFLAGS += -DRIL_CALL_AUDIO_PATH_EXTRAVOLUME
 endif
+ifneq ($(filter m7450 mdm9x35 ss333 xmm7260,$(BOARD_MODEM_TYPE)),)
+LOCAL_CFLAGS += -DSAMSUNG_NEXT_GEN_MODEM
+endif
 
 LOCAL_MODULE:= libsecril-client
 LOCAL_PRELINK_MODULE := false

ril/libsecril-client/secril-client.cpp

@@ -84,7 +84,7 @@ namespace android {
 #define OEM_SND_TYPE_HEADSET        0x31 // Headset(0x30) + Voice(0x01)
 #define OEM_SND_TYPE_BTVOICE        0x41 // BT(0x40) + Voice(0x01)
 
-#ifdef MODEM_TYPE_XMM7260
+#ifdef SAMSUNG_NEXT_GEN_MODEM
 #define OEM_SND_AUDIO_PATH_HANDSET            0x01
 #define OEM_SND_AUDIO_PATH_HEADSET            0x02
 #define OEM_SND_AUDIO_PATH_HFK                0x06