Change radio related service names to slot1, slot2, slot3...
Test: Basic telephony sanity
Bug: 36570718
Merged-in: Ia3c3f7b3e2cedd05bafa2d335f9c04e831da0cf4
Change-Id: Ia3c3f7b3e2cedd05bafa2d335f9c04e831da0cf4
diff --git a/libril/ril_internal.h b/libril/ril_internal.h
index 68d3863..646d9b7 100644
--- a/libril/ril_internal.h
+++ b/libril/ril_internal.h
@@ -21,15 +21,11 @@
namespace android {
-#define SOCKET_NAME_RIL "rild"
-#define SOCKET2_NAME_RIL "rild2"
-#define SOCKET3_NAME_RIL "rild3"
-#define SOCKET4_NAME_RIL "rild4"
-
-#define OEM_HOOK_SERVICE_NAME "oemhook"
-#define OEM_HOOK2_SERVICE_NAME "oemhook2"
-#define OEM_HOOK3_SERVICE_NAME "oemhook3"
-#define OEM_HOOK4_SERVICE_NAME "oemhook4"
+#define RIL_SERVICE_NAME_BASE "slot"
+#define RIL1_SERVICE_NAME "slot1"
+#define RIL2_SERVICE_NAME "slot2"
+#define RIL3_SERVICE_NAME "slot3"
+#define RIL4_SERVICE_NAME "slot4"
/* Constants for response types */
#define RESPONSE_SOLICITED 0
@@ -93,7 +89,7 @@
RequestInfo * addRequestToList(int serial, int slotId, int request);
-char * RIL_getRilSocketName();
+char * RIL_getServiceName();
void releaseWakeLock();