diff --git a/ril/libril/RilSapSocket.cpp b/ril/libril/RilSapSocket.cpp
index cf99773..ed7a110 100644
--- a/ril/libril/RilSapSocket.cpp
+++ b/ril/libril/RilSapSocket.cpp
@@ -47,7 +47,7 @@ void RilSapSocket::sOnRequestComplete (RIL_Token t,
     RilSapSocket *sap_socket;
     SapSocketRequest *request = (SapSocketRequest*) t;
 
-    RLOGD("Socket id:%d", request->socketId);
+    RLOGE("Socket id:%d", request->socketId);
 
     sap_socket = getSocketById(request->socketId);
 
@@ -86,10 +86,10 @@ void RilSapSocket::sOnUnsolicitedResponse(int unsolResponse,
 
 void RilSapSocket::printList() {
     RilSapSocketList *current = head;
-    RLOGD("Printing socket list");
+    RLOGE("Printing socket list");
     while(NULL != current) {
-        RLOGD("SocketName:%s",current->socket->name);
-        RLOGD("Socket id:%d",current->socket->id);
+        RLOGE("SocketName:%s",current->socket->name);
+        RLOGE("Socket id:%d",current->socket->id);
         current = current->next;
     }
 }
@@ -98,7 +98,7 @@ RilSapSocket *RilSapSocket::getSocketById(RIL_SOCKET_ID socketId) {
     RilSapSocket *sap_socket;
     RilSapSocketList *current = head;
 
-    RLOGD("Entered getSocketById");
+    RLOGE("Entered getSocketById");
     printList();
 
     while(NULL != current) {
@@ -161,7 +161,7 @@ void RilSapSocket::addSocketToList(const char *socketName, RIL_SOCKET_ID socketi
         listItem->socket = socket;
         listItem->next = NULL;
 
-        RLOGD("Adding socket with id: %d", socket->id);
+        RLOGE("Adding socket with id: %d", socket->id);
 
         if(NULL == head) {
             head = listItem;
@@ -287,4 +287,4 @@ void RilSapSocket::onUnsolicitedResponse(int unsolResponse, void *data, size_t d
         sap::processUnsolResponse(&rsp, this);
         free(payload);
     }
-}
\ No newline at end of file
+}
diff --git a/ril/libril/ril.cpp b/ril/libril/ril.cpp
index 3abe559..caa7830 100644
--- a/ril/libril/ril.cpp
+++ b/ril/libril/ril.cpp
@@ -535,7 +535,7 @@ checkAndDequeueRequestInfoIfAck(struct RequestInfo *pRI, bool isAck) {
             ret = 1;
             if (isAck) { // Async ack
                 if (pRI->wasAckSent == 1) {
-                    RLOGD("Ack was already sent for %s", requestToString(pRI->pCI->requestNumber));
+                    RLOGE("Ack was already sent for %s", requestToString(pRI->pCI->requestNumber));
                 } else {
                     pRI->wasAckSent = 1;
                 }
@@ -567,7 +567,7 @@ RIL_onRequestAck(RIL_Token t) {
     socket_id = pRI->socket_id;
 
 #if VDBG
-    RLOGD("Request Ack, %s", rilSocketIdToString(socket_id));
+    RLOGE("Request Ack, %s", rilSocketIdToString(socket_id));
 #endif
 
     appendPrintBuf("Ack [%04d]< %s", pRI->token, requestToString(pRI->pCI->requestNumber));
@@ -599,13 +599,13 @@ RIL_onRequestComplete(RIL_Token t, RIL_Errno e, void *response, size_t responsel
 
     socket_id = pRI->socket_id;
 #if VDBG
-    RLOGD("RequestComplete, %s", rilSocketIdToString(socket_id));
+    RLOGE("RequestComplete, %s", rilSocketIdToString(socket_id));
 #endif
 
     if (pRI->local > 0) {
         // Locally issued command...void only!
         // response does not go back up the command socket
-        RLOGD("C[locl]< %s", requestToString(pRI->pCI->requestNumber));
+        RLOGE("C[locl]< %s", requestToString(pRI->pCI->requestNumber));
 
         free(pRI);
         return;
diff --git a/ril/libril/ril_event.cpp b/ril/libril/ril_event.cpp
index 84b8b72..386d46e 100644
--- a/ril/libril/ril_event.cpp
+++ b/ril/libril/ril_event.cpp
@@ -72,10 +72,10 @@ static struct ril_event * watch_table[MAX_FD_EVENTS];
 static struct ril_event timer_list;
 static struct ril_event pending_list;
 
-#define DEBUG 0
+#define DEBUG 1
 
 #if DEBUG
-#define dlog(x...) RLOGD( x )
+#define dlog(x...) RLOGE( x )
 static void dump_event(struct ril_event * ev)
 {
     dlog("~~~~ Event %x ~~~~", (unsigned int)ev);
diff --git a/ril/libril/ril_internal.h b/ril/libril/ril_internal.h
index 350791b..f160338 100644
--- a/ril/libril/ril_internal.h
+++ b/ril/libril/ril_internal.h
@@ -33,7 +33,7 @@ namespace android {
 #define RESPONSE_UNSOLICITED_ACK_EXP 4
 
 // Enable verbose logging
-#define VDBG 0
+#define VDBG 1
 
 #define MIN(a,b) ((a)<(b) ? (a) : (b))
 
diff --git a/ril/libril/ril_service.cpp b/ril/libril/ril_service.cpp
index e5acc60..1ff13f8 100644
--- a/ril/libril/ril_service.cpp
+++ b/ril/libril/ril_service.cpp
@@ -795,7 +795,7 @@ void RadioImpl::checkReturnStatus(Return<void>& ret) {
 Return<void> RadioImpl::setResponseFunctions(
         const ::android::sp<IRadioResponse>& radioResponseParam,
         const ::android::sp<IRadioIndication>& radioIndicationParam) {
-    RLOGD("setResponseFunctions");
+    RLOGE("setResponseFunctions");
 
     pthread_rwlock_t *radioServiceRwlockPtr = radio::getRadioServiceRwlock(mSlotId);
     int ret = pthread_rwlock_wrlock(radioServiceRwlockPtr);
@@ -823,7 +823,7 @@ Return<void> RadioImpl::setResponseFunctions(
 
 Return<void> RadioImpl::getIccCardStatus(int32_t serial) {
 #if VDBG
-    RLOGD("getIccCardStatus: serial %d", serial);
+    RLOGE("getIccCardStatus: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_SIM_STATUS);
     return Void();
@@ -832,7 +832,7 @@ Return<void> RadioImpl::getIccCardStatus(int32_t serial) {
 Return<void> RadioImpl::supplyIccPinForApp(int32_t serial, const hidl_string& pin,
         const hidl_string& aid) {
 #if VDBG
-    RLOGD("supplyIccPinForApp: serial %d", serial);
+    RLOGE("supplyIccPinForApp: serial %d", serial);
 #endif
     dispatchStrings(serial, mSlotId, RIL_REQUEST_ENTER_SIM_PIN, true,
             2, pin.c_str(), aid.c_str());
@@ -842,7 +842,7 @@ Return<void> RadioImpl::supplyIccPinForApp(int32_t serial, const hidl_string& pi
 Return<void> RadioImpl::supplyIccPukForApp(int32_t serial, const hidl_string& puk,
                                            const hidl_string& pin, const hidl_string& aid) {
 #if VDBG
-    RLOGD("supplyIccPukForApp: serial %d", serial);
+    RLOGE("supplyIccPukForApp: serial %d", serial);
 #endif
     dispatchStrings(serial, mSlotId, RIL_REQUEST_ENTER_SIM_PUK, true,
             3, puk.c_str(), pin.c_str(), aid.c_str());
@@ -852,7 +852,7 @@ Return<void> RadioImpl::supplyIccPukForApp(int32_t serial, const hidl_string& pu
 Return<void> RadioImpl::supplyIccPin2ForApp(int32_t serial, const hidl_string& pin2,
                                             const hidl_string& aid) {
 #if VDBG
-    RLOGD("supplyIccPin2ForApp: serial %d", serial);
+    RLOGE("supplyIccPin2ForApp: serial %d", serial);
 #endif
     dispatchStrings(serial, mSlotId, RIL_REQUEST_ENTER_SIM_PIN2, true,
             2, pin2.c_str(), aid.c_str());
@@ -862,7 +862,7 @@ Return<void> RadioImpl::supplyIccPin2ForApp(int32_t serial, const hidl_string& p
 Return<void> RadioImpl::supplyIccPuk2ForApp(int32_t serial, const hidl_string& puk2,
                                             const hidl_string& pin2, const hidl_string& aid) {
 #if VDBG
-    RLOGD("supplyIccPuk2ForApp: serial %d", serial);
+    RLOGE("supplyIccPuk2ForApp: serial %d", serial);
 #endif
     dispatchStrings(serial, mSlotId, RIL_REQUEST_ENTER_SIM_PUK2, true,
             3, puk2.c_str(), pin2.c_str(), aid.c_str());
@@ -872,7 +872,7 @@ Return<void> RadioImpl::supplyIccPuk2ForApp(int32_t serial, const hidl_string& p
 Return<void> RadioImpl::changeIccPinForApp(int32_t serial, const hidl_string& oldPin,
                                            const hidl_string& newPin, const hidl_string& aid) {
 #if VDBG
-    RLOGD("changeIccPinForApp: serial %d", serial);
+    RLOGE("changeIccPinForApp: serial %d", serial);
 #endif
     dispatchStrings(serial, mSlotId, RIL_REQUEST_CHANGE_SIM_PIN, true,
             3, oldPin.c_str(), newPin.c_str(), aid.c_str());
@@ -882,7 +882,7 @@ Return<void> RadioImpl::changeIccPinForApp(int32_t serial, const hidl_string& ol
 Return<void> RadioImpl::changeIccPin2ForApp(int32_t serial, const hidl_string& oldPin2,
                                             const hidl_string& newPin2, const hidl_string& aid) {
 #if VDBG
-    RLOGD("changeIccPin2ForApp: serial %d", serial);
+    RLOGE("changeIccPin2ForApp: serial %d", serial);
 #endif
     dispatchStrings(serial, mSlotId, RIL_REQUEST_CHANGE_SIM_PIN2, true,
             3, oldPin2.c_str(), newPin2.c_str(), aid.c_str());
@@ -892,7 +892,7 @@ Return<void> RadioImpl::changeIccPin2ForApp(int32_t serial, const hidl_string& o
 Return<void> RadioImpl::supplyNetworkDepersonalization(int32_t serial,
                                                        const hidl_string& netPin) {
 #if VDBG
-    RLOGD("supplyNetworkDepersonalization: serial %d", serial);
+    RLOGE("supplyNetworkDepersonalization: serial %d", serial);
 #endif
     dispatchStrings(serial, mSlotId, RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION, true,
             1, netPin.c_str());
@@ -901,7 +901,7 @@ Return<void> RadioImpl::supplyNetworkDepersonalization(int32_t serial,
 
 Return<void> RadioImpl::getCurrentCalls(int32_t serial) {
 #if VDBG
-    RLOGD("getCurrentCalls: serial %d", serial);
+    RLOGE("getCurrentCalls: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_CURRENT_CALLS);
     return Void();
@@ -909,7 +909,7 @@ Return<void> RadioImpl::getCurrentCalls(int32_t serial) {
 
 Return<void> RadioImpl::dial(int32_t serial, const Dial& dialInfo) {
 #if VDBG
-    RLOGD("dial: serial %d", serial);
+    RLOGE("dial: serial %d", serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_DIAL);
     if (pRI == NULL) {
@@ -951,7 +951,7 @@ Return<void> RadioImpl::dial(int32_t serial, const Dial& dialInfo) {
 
 Return<void> RadioImpl::getImsiForApp(int32_t serial, const hidl_string& aid) {
 #if VDBG
-    RLOGD("getImsiForApp: serial %d", serial);
+    RLOGE("getImsiForApp: serial %d", serial);
 #endif
     dispatchStrings(serial, mSlotId, RIL_REQUEST_GET_IMSI, false,
             1, aid.c_str());
@@ -960,7 +960,7 @@ Return<void> RadioImpl::getImsiForApp(int32_t serial, const hidl_string& aid) {
 
 Return<void> RadioImpl::hangup(int32_t serial, int32_t gsmIndex) {
 #if VDBG
-    RLOGD("hangup: serial %d", serial);
+    RLOGE("hangup: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_HANGUP, 1, gsmIndex);
     return Void();
@@ -968,7 +968,7 @@ Return<void> RadioImpl::hangup(int32_t serial, int32_t gsmIndex) {
 
 Return<void> RadioImpl::hangupWaitingOrBackground(int32_t serial) {
 #if VDBG
-    RLOGD("hangupWaitingOrBackground: serial %d", serial);
+    RLOGE("hangupWaitingOrBackground: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND);
     return Void();
@@ -976,7 +976,7 @@ Return<void> RadioImpl::hangupWaitingOrBackground(int32_t serial) {
 
 Return<void> RadioImpl::hangupForegroundResumeBackground(int32_t serial) {
 #if VDBG
-    RLOGD("hangupForegroundResumeBackground: serial %d", serial);
+    RLOGE("hangupForegroundResumeBackground: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND);
     return Void();
@@ -984,7 +984,7 @@ Return<void> RadioImpl::hangupForegroundResumeBackground(int32_t serial) {
 
 Return<void> RadioImpl::switchWaitingOrHoldingAndActive(int32_t serial) {
 #if VDBG
-    RLOGD("switchWaitingOrHoldingAndActive: serial %d", serial);
+    RLOGE("switchWaitingOrHoldingAndActive: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE);
     return Void();
@@ -992,7 +992,7 @@ Return<void> RadioImpl::switchWaitingOrHoldingAndActive(int32_t serial) {
 
 Return<void> RadioImpl::conference(int32_t serial) {
 #if VDBG
-    RLOGD("conference: serial %d", serial);
+    RLOGE("conference: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_CONFERENCE);
     return Void();
@@ -1000,7 +1000,7 @@ Return<void> RadioImpl::conference(int32_t serial) {
 
 Return<void> RadioImpl::rejectCall(int32_t serial) {
 #if VDBG
-    RLOGD("rejectCall: serial %d", serial);
+    RLOGE("rejectCall: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_UDUB);
     return Void();
@@ -1008,7 +1008,7 @@ Return<void> RadioImpl::rejectCall(int32_t serial) {
 
 Return<void> RadioImpl::getLastCallFailCause(int32_t serial) {
 #if VDBG
-    RLOGD("getLastCallFailCause: serial %d", serial);
+    RLOGE("getLastCallFailCause: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_LAST_CALL_FAIL_CAUSE);
     return Void();
@@ -1016,7 +1016,7 @@ Return<void> RadioImpl::getLastCallFailCause(int32_t serial) {
 
 Return<void> RadioImpl::getSignalStrength(int32_t serial) {
 #if VDBG
-    RLOGD("getSignalStrength: serial %d", serial);
+    RLOGE("getSignalStrength: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_SIGNAL_STRENGTH);
     return Void();
@@ -1024,7 +1024,7 @@ Return<void> RadioImpl::getSignalStrength(int32_t serial) {
 
 Return<void> RadioImpl::getVoiceRegistrationState(int32_t serial) {
 #if VDBG
-    RLOGD("getVoiceRegistrationState: serial %d", serial);
+    RLOGE("getVoiceRegistrationState: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_VOICE_REGISTRATION_STATE);
     return Void();
@@ -1032,7 +1032,7 @@ Return<void> RadioImpl::getVoiceRegistrationState(int32_t serial) {
 
 Return<void> RadioImpl::getDataRegistrationState(int32_t serial) {
 #if VDBG
-    RLOGD("getDataRegistrationState: serial %d", serial);
+    RLOGE("getDataRegistrationState: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_DATA_REGISTRATION_STATE);
     return Void();
@@ -1040,21 +1040,21 @@ Return<void> RadioImpl::getDataRegistrationState(int32_t serial) {
 
 Return<void> RadioImpl::getOperator(int32_t serial) {
 #if VDBG
-    RLOGD("getOperator: serial %d", serial);
+    RLOGE("getOperator: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_OPERATOR);
     return Void();
 }
 
 Return<void> RadioImpl::setRadioPower(int32_t serial, bool on) {
-    RLOGD("setRadioPower: serial %d on %d", serial, on);
+    RLOGE("setRadioPower: serial %d on %d", serial, on);
     dispatchInts(serial, mSlotId, RIL_REQUEST_RADIO_POWER, 1, BOOL_TO_INT(on));
     return Void();
 }
 
 Return<void> RadioImpl::sendDtmf(int32_t serial, const hidl_string& s) {
 #if VDBG
-    RLOGD("sendDtmf: serial %d", serial);
+    RLOGE("sendDtmf: serial %d", serial);
 #endif
     dispatchString(serial, mSlotId, RIL_REQUEST_DTMF, s.c_str());
     return Void();
@@ -1062,7 +1062,7 @@ Return<void> RadioImpl::sendDtmf(int32_t serial, const hidl_string& s) {
 
 Return<void> RadioImpl::sendSms(int32_t serial, const GsmSmsMessage& message) {
 #if VDBG
-    RLOGD("sendSms: serial %d", serial);
+    RLOGE("sendSms: serial %d", serial);
 #endif
     dispatchStrings(serial, mSlotId, RIL_REQUEST_SEND_SMS, false,
             2, message.smscPdu.c_str(), message.pdu.c_str());
@@ -1071,7 +1071,7 @@ Return<void> RadioImpl::sendSms(int32_t serial, const GsmSmsMessage& message) {
 
 Return<void> RadioImpl::sendSMSExpectMore(int32_t serial, const GsmSmsMessage& message) {
 #if VDBG
-    RLOGD("sendSMSExpectMore: serial %d", serial);
+    RLOGE("sendSMSExpectMore: serial %d", serial);
 #endif
     dispatchStrings(serial, mSlotId, RIL_REQUEST_SEND_SMS_EXPECT_MORE, false,
             2, message.smscPdu.c_str(), message.pdu.c_str());
@@ -1101,7 +1101,7 @@ Return<void> RadioImpl::setupDataCall(int32_t serial, RadioTechnology radioTechn
                                       bool roamingAllowed, bool isRoaming) {
 
 #if VDBG
-    RLOGD("setupDataCall: serial %d", serial);
+    RLOGE("setupDataCall: serial %d", serial);
 #endif
 
     if (s_vendorFunctions->version >= 4 && s_vendorFunctions->version <= 14) {
@@ -1154,7 +1154,7 @@ Return<void> RadioImpl::setupDataCall(int32_t serial, RadioTechnology radioTechn
 
 Return<void> RadioImpl::iccIOForApp(int32_t serial, const IccIo& iccIo) {
 #if VDBG
-    RLOGD("iccIOForApp: serial %d", serial);
+    RLOGE("iccIOForApp: serial %d", serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_SIM_IO);
     if (pRI == NULL) {
@@ -1196,7 +1196,7 @@ Return<void> RadioImpl::iccIOForApp(int32_t serial, const IccIo& iccIo) {
 
 Return<void> RadioImpl::sendUssd(int32_t serial, const hidl_string& ussd) {
 #if VDBG
-    RLOGD("sendUssd: serial %d", serial);
+    RLOGE("sendUssd: serial %d", serial);
 #endif
     dispatchString(serial, mSlotId, RIL_REQUEST_SEND_USSD, ussd.c_str());
     return Void();
@@ -1204,7 +1204,7 @@ Return<void> RadioImpl::sendUssd(int32_t serial, const hidl_string& ussd) {
 
 Return<void> RadioImpl::cancelPendingUssd(int32_t serial) {
 #if VDBG
-    RLOGD("cancelPendingUssd: serial %d", serial);
+    RLOGE("cancelPendingUssd: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_CANCEL_USSD);
     return Void();
@@ -1212,7 +1212,7 @@ Return<void> RadioImpl::cancelPendingUssd(int32_t serial) {
 
 Return<void> RadioImpl::getClir(int32_t serial) {
 #if VDBG
-    RLOGD("getClir: serial %d", serial);
+    RLOGE("getClir: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_CLIR);
     return Void();
@@ -1220,7 +1220,7 @@ Return<void> RadioImpl::getClir(int32_t serial) {
 
 Return<void> RadioImpl::setClir(int32_t serial, int32_t status) {
 #if VDBG
-    RLOGD("setClir: serial %d", serial);
+    RLOGE("setClir: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_SET_CLIR, 1, status);
     return Void();
@@ -1228,7 +1228,7 @@ Return<void> RadioImpl::setClir(int32_t serial, int32_t status) {
 
 Return<void> RadioImpl::getCallForwardStatus(int32_t serial, const CallForwardInfo& callInfo) {
 #if VDBG
-    RLOGD("getCallForwardStatus: serial %d", serial);
+    RLOGE("getCallForwardStatus: serial %d", serial);
 #endif
     dispatchCallForwardStatus(serial, mSlotId, RIL_REQUEST_QUERY_CALL_FORWARD_STATUS,
             callInfo);
@@ -1237,7 +1237,7 @@ Return<void> RadioImpl::getCallForwardStatus(int32_t serial, const CallForwardIn
 
 Return<void> RadioImpl::setCallForward(int32_t serial, const CallForwardInfo& callInfo) {
 #if VDBG
-    RLOGD("setCallForward: serial %d", serial);
+    RLOGE("setCallForward: serial %d", serial);
 #endif
     dispatchCallForwardStatus(serial, mSlotId, RIL_REQUEST_SET_CALL_FORWARD,
             callInfo);
@@ -1246,7 +1246,7 @@ Return<void> RadioImpl::setCallForward(int32_t serial, const CallForwardInfo& ca
 
 Return<void> RadioImpl::getCallWaiting(int32_t serial, int32_t serviceClass) {
 #if VDBG
-    RLOGD("getCallWaiting: serial %d", serial);
+    RLOGE("getCallWaiting: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_QUERY_CALL_WAITING, 1, serviceClass);
     return Void();
@@ -1254,7 +1254,7 @@ Return<void> RadioImpl::getCallWaiting(int32_t serial, int32_t serviceClass) {
 
 Return<void> RadioImpl::setCallWaiting(int32_t serial, bool enable, int32_t serviceClass) {
 #if VDBG
-    RLOGD("setCallWaiting: serial %d", serial);
+    RLOGE("setCallWaiting: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_SET_CALL_WAITING, 2, BOOL_TO_INT(enable),
             serviceClass);
@@ -1264,7 +1264,7 @@ Return<void> RadioImpl::setCallWaiting(int32_t serial, bool enable, int32_t serv
 Return<void> RadioImpl::acknowledgeLastIncomingGsmSms(int32_t serial,
                                                       bool success, SmsAcknowledgeFailCause cause) {
 #if VDBG
-    RLOGD("acknowledgeLastIncomingGsmSms: serial %d", serial);
+    RLOGE("acknowledgeLastIncomingGsmSms: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_SMS_ACKNOWLEDGE, 2, BOOL_TO_INT(success),
             cause);
@@ -1273,7 +1273,7 @@ Return<void> RadioImpl::acknowledgeLastIncomingGsmSms(int32_t serial,
 
 Return<void> RadioImpl::acceptCall(int32_t serial) {
 #if VDBG
-    RLOGD("acceptCall: serial %d", serial);
+    RLOGE("acceptCall: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_ANSWER);
     return Void();
@@ -1282,7 +1282,7 @@ Return<void> RadioImpl::acceptCall(int32_t serial) {
 Return<void> RadioImpl::deactivateDataCall(int32_t serial,
                                            int32_t cid, bool reasonRadioShutDown) {
 #if VDBG
-    RLOGD("deactivateDataCall: serial %d", serial);
+    RLOGE("deactivateDataCall: serial %d", serial);
 #endif
     dispatchStrings(serial, mSlotId, RIL_REQUEST_DEACTIVATE_DATA_CALL, false,
             2, (std::to_string(cid)).c_str(), reasonRadioShutDown ? "1" : "0");
@@ -1293,7 +1293,7 @@ Return<void> RadioImpl::getFacilityLockForApp(int32_t serial, const hidl_string&
                                               const hidl_string& password, int32_t serviceClass,
                                               const hidl_string& appId) {
 #if VDBG
-    RLOGD("getFacilityLockForApp: serial %d", serial);
+    RLOGE("getFacilityLockForApp: serial %d", serial);
 #endif
     dispatchStrings(serial, mSlotId, RIL_REQUEST_QUERY_FACILITY_LOCK, true,
             4, facility.c_str(), password.c_str(),
@@ -1305,7 +1305,7 @@ Return<void> RadioImpl::setFacilityLockForApp(int32_t serial, const hidl_string&
                                               bool lockState, const hidl_string& password,
                                               int32_t serviceClass, const hidl_string& appId) {
 #if VDBG
-    RLOGD("setFacilityLockForApp: serial %d", serial);
+    RLOGE("setFacilityLockForApp: serial %d", serial);
 #endif
     dispatchStrings(serial, mSlotId, RIL_REQUEST_SET_FACILITY_LOCK, true,
             5, facility.c_str(), lockState ? "1" : "0", password.c_str(),
@@ -1317,7 +1317,7 @@ Return<void> RadioImpl::setBarringPassword(int32_t serial, const hidl_string& fa
                                            const hidl_string& oldPassword,
                                            const hidl_string& newPassword) {
 #if VDBG
-    RLOGD("setBarringPassword: serial %d", serial);
+    RLOGE("setBarringPassword: serial %d", serial);
 #endif
     dispatchStrings(serial, mSlotId, RIL_REQUEST_CHANGE_BARRING_PASSWORD, true,
             3, facility.c_str(), oldPassword.c_str(), newPassword.c_str());
@@ -1326,7 +1326,7 @@ Return<void> RadioImpl::setBarringPassword(int32_t serial, const hidl_string& fa
 
 Return<void> RadioImpl::getNetworkSelectionMode(int32_t serial) {
 #if VDBG
-    RLOGD("getNetworkSelectionMode: serial %d", serial);
+    RLOGE("getNetworkSelectionMode: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE);
     return Void();
@@ -1334,7 +1334,7 @@ Return<void> RadioImpl::getNetworkSelectionMode(int32_t serial) {
 
 Return<void> RadioImpl::setNetworkSelectionModeAutomatic(int32_t serial) {
 #if VDBG
-    RLOGD("setNetworkSelectionModeAutomatic: serial %d", serial);
+    RLOGE("setNetworkSelectionModeAutomatic: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC);
     return Void();
@@ -1343,7 +1343,7 @@ Return<void> RadioImpl::setNetworkSelectionModeAutomatic(int32_t serial) {
 Return<void> RadioImpl::setNetworkSelectionModeManual(int32_t serial,
                                                       const hidl_string& operatorNumeric) {
 #if VDBG
-    RLOGD("setNetworkSelectionModeManual: serial %d", serial);
+    RLOGE("setNetworkSelectionModeManual: serial %d", serial);
 #endif
     dispatchString(serial, mSlotId, RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL,
             operatorNumeric.c_str());
@@ -1352,7 +1352,7 @@ Return<void> RadioImpl::setNetworkSelectionModeManual(int32_t serial,
 
 Return<void> RadioImpl::getAvailableNetworks(int32_t serial) {
 #if VDBG
-    RLOGD("getAvailableNetworks: serial %d", serial);
+    RLOGE("getAvailableNetworks: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_QUERY_AVAILABLE_NETWORKS);
     return Void();
@@ -1360,7 +1360,7 @@ Return<void> RadioImpl::getAvailableNetworks(int32_t serial) {
 
 Return<void> RadioImpl::startNetworkScan(int32_t serial, const V1_1::NetworkScanRequest& request) {
 #if VDBG
-    RLOGD("startNetworkScan: serial %d", serial);
+    RLOGE("startNetworkScan: serial %d", serial);
 #endif
 
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_START_NETWORK_SCAN);
@@ -1426,7 +1426,7 @@ Return<void> RadioImpl::startNetworkScan(int32_t serial, const V1_1::NetworkScan
 
 Return<void> RadioImpl::stopNetworkScan(int32_t serial) {
 #if VDBG
-    RLOGD("stopNetworkScan: serial %d", serial);
+    RLOGE("stopNetworkScan: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_STOP_NETWORK_SCAN);
     return Void();
@@ -1434,7 +1434,7 @@ Return<void> RadioImpl::stopNetworkScan(int32_t serial) {
 
 Return<void> RadioImpl::startDtmf(int32_t serial, const hidl_string& s) {
 #if VDBG
-    RLOGD("startDtmf: serial %d", serial);
+    RLOGE("startDtmf: serial %d", serial);
 #endif
     dispatchString(serial, mSlotId, RIL_REQUEST_DTMF_START,
             s.c_str());
@@ -1443,7 +1443,7 @@ Return<void> RadioImpl::startDtmf(int32_t serial, const hidl_string& s) {
 
 Return<void> RadioImpl::stopDtmf(int32_t serial) {
 #if VDBG
-    RLOGD("stopDtmf: serial %d", serial);
+    RLOGE("stopDtmf: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_DTMF_STOP);
     return Void();
@@ -1451,7 +1451,7 @@ Return<void> RadioImpl::stopDtmf(int32_t serial) {
 
 Return<void> RadioImpl::getBasebandVersion(int32_t serial) {
 #if VDBG
-    RLOGD("getBasebandVersion: serial %d", serial);
+    RLOGE("getBasebandVersion: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_BASEBAND_VERSION);
     return Void();
@@ -1459,7 +1459,7 @@ Return<void> RadioImpl::getBasebandVersion(int32_t serial) {
 
 Return<void> RadioImpl::separateConnection(int32_t serial, int32_t gsmIndex) {
 #if VDBG
-    RLOGD("separateConnection: serial %d", serial);
+    RLOGE("separateConnection: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_SEPARATE_CONNECTION, 1, gsmIndex);
     return Void();
@@ -1467,7 +1467,7 @@ Return<void> RadioImpl::separateConnection(int32_t serial, int32_t gsmIndex) {
 
 Return<void> RadioImpl::setMute(int32_t serial, bool enable) {
 #if VDBG
-    RLOGD("setMute: serial %d", serial);
+    RLOGE("setMute: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_SET_MUTE, 1, BOOL_TO_INT(enable));
     return Void();
@@ -1475,7 +1475,7 @@ Return<void> RadioImpl::setMute(int32_t serial, bool enable) {
 
 Return<void> RadioImpl::getMute(int32_t serial) {
 #if VDBG
-    RLOGD("getMute: serial %d", serial);
+    RLOGE("getMute: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_MUTE);
     return Void();
@@ -1483,7 +1483,7 @@ Return<void> RadioImpl::getMute(int32_t serial) {
 
 Return<void> RadioImpl::getClip(int32_t serial) {
 #if VDBG
-    RLOGD("getClip: serial %d", serial);
+    RLOGE("getClip: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_QUERY_CLIP);
     return Void();
@@ -1491,7 +1491,7 @@ Return<void> RadioImpl::getClip(int32_t serial) {
 
 Return<void> RadioImpl::getDataCallList(int32_t serial) {
 #if VDBG
-    RLOGD("getDataCallList: serial %d", serial);
+    RLOGE("getDataCallList: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_DATA_CALL_LIST);
     return Void();
@@ -1499,7 +1499,7 @@ Return<void> RadioImpl::getDataCallList(int32_t serial) {
 
 Return<void> RadioImpl::setSuppServiceNotifications(int32_t serial, bool enable) {
 #if VDBG
-    RLOGD("setSuppServiceNotifications: serial %d", serial);
+    RLOGE("setSuppServiceNotifications: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_SET_SUPP_SVC_NOTIFICATION, 1,
             BOOL_TO_INT(enable));
@@ -1508,7 +1508,7 @@ Return<void> RadioImpl::setSuppServiceNotifications(int32_t serial, bool enable)
 
 Return<void> RadioImpl::writeSmsToSim(int32_t serial, const SmsWriteArgs& smsWriteArgs) {
 #if VDBG
-    RLOGD("writeSmsToSim: serial %d", serial);
+    RLOGE("writeSmsToSim: serial %d", serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_WRITE_SMS_TO_SIM);
     if (pRI == NULL) {
@@ -1536,7 +1536,7 @@ Return<void> RadioImpl::writeSmsToSim(int32_t serial, const SmsWriteArgs& smsWri
 
 Return<void> RadioImpl::deleteSmsOnSim(int32_t serial, int32_t index) {
 #if VDBG
-    RLOGD("deleteSmsOnSim: serial %d", serial);
+    RLOGE("deleteSmsOnSim: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_DELETE_SMS_ON_SIM, 1, index);
     return Void();
@@ -1544,7 +1544,7 @@ Return<void> RadioImpl::deleteSmsOnSim(int32_t serial, int32_t index) {
 
 Return<void> RadioImpl::setBandMode(int32_t serial, RadioBandMode mode) {
 #if VDBG
-    RLOGD("setBandMode: serial %d", serial);
+    RLOGE("setBandMode: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_SET_BAND_MODE, 1, mode);
     return Void();
@@ -1552,7 +1552,7 @@ Return<void> RadioImpl::setBandMode(int32_t serial, RadioBandMode mode) {
 
 Return<void> RadioImpl::getAvailableBandModes(int32_t serial) {
 #if VDBG
-    RLOGD("getAvailableBandModes: serial %d", serial);
+    RLOGE("getAvailableBandModes: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_QUERY_AVAILABLE_BAND_MODE);
     return Void();
@@ -1560,7 +1560,7 @@ Return<void> RadioImpl::getAvailableBandModes(int32_t serial) {
 
 Return<void> RadioImpl::sendEnvelope(int32_t serial, const hidl_string& command) {
 #if VDBG
-    RLOGD("sendEnvelope: serial %d", serial);
+    RLOGE("sendEnvelope: serial %d", serial);
 #endif
     dispatchString(serial, mSlotId, RIL_REQUEST_STK_SEND_ENVELOPE_COMMAND,
             command.c_str());
@@ -1570,7 +1570,7 @@ Return<void> RadioImpl::sendEnvelope(int32_t serial, const hidl_string& command)
 Return<void> RadioImpl::sendTerminalResponseToSim(int32_t serial,
                                                   const hidl_string& commandResponse) {
 #if VDBG
-    RLOGD("sendTerminalResponseToSim: serial %d", serial);
+    RLOGE("sendTerminalResponseToSim: serial %d", serial);
 #endif
     dispatchString(serial, mSlotId, RIL_REQUEST_STK_SEND_TERMINAL_RESPONSE,
             commandResponse.c_str());
@@ -1579,7 +1579,7 @@ Return<void> RadioImpl::sendTerminalResponseToSim(int32_t serial,
 
 Return<void> RadioImpl::handleStkCallSetupRequestFromSim(int32_t serial, bool accept) {
 #if VDBG
-    RLOGD("handleStkCallSetupRequestFromSim: serial %d", serial);
+    RLOGE("handleStkCallSetupRequestFromSim: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM,
             1, BOOL_TO_INT(accept));
@@ -1588,7 +1588,7 @@ Return<void> RadioImpl::handleStkCallSetupRequestFromSim(int32_t serial, bool ac
 
 Return<void> RadioImpl::explicitCallTransfer(int32_t serial) {
 #if VDBG
-    RLOGD("explicitCallTransfer: serial %d", serial);
+    RLOGE("explicitCallTransfer: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_EXPLICIT_CALL_TRANSFER);
     return Void();
@@ -1596,7 +1596,7 @@ Return<void> RadioImpl::explicitCallTransfer(int32_t serial) {
 
 Return<void> RadioImpl::setPreferredNetworkType(int32_t serial, PreferredNetworkType nwType) {
 #if VDBG
-    RLOGD("setPreferredNetworkType: serial %d", serial);
+    RLOGE("setPreferredNetworkType: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, 1, nwType);
     return Void();
@@ -1604,7 +1604,7 @@ Return<void> RadioImpl::setPreferredNetworkType(int32_t serial, PreferredNetwork
 
 Return<void> RadioImpl::getPreferredNetworkType(int32_t serial) {
 #if VDBG
-    RLOGD("getPreferredNetworkType: serial %d", serial);
+    RLOGE("getPreferredNetworkType: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE);
     return Void();
@@ -1612,7 +1612,7 @@ Return<void> RadioImpl::getPreferredNetworkType(int32_t serial) {
 
 Return<void> RadioImpl::getNeighboringCids(int32_t serial) {
 #if VDBG
-    RLOGD("getNeighboringCids: serial %d", serial);
+    RLOGE("getNeighboringCids: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_NEIGHBORING_CELL_IDS);
     return Void();
@@ -1620,7 +1620,7 @@ Return<void> RadioImpl::getNeighboringCids(int32_t serial) {
 
 Return<void> RadioImpl::setLocationUpdates(int32_t serial, bool enable) {
 #if VDBG
-    RLOGD("setLocationUpdates: serial %d", serial);
+    RLOGE("setLocationUpdates: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_SET_LOCATION_UPDATES, 1, BOOL_TO_INT(enable));
     return Void();
@@ -1628,7 +1628,7 @@ Return<void> RadioImpl::setLocationUpdates(int32_t serial, bool enable) {
 
 Return<void> RadioImpl::setCdmaSubscriptionSource(int32_t serial, CdmaSubscriptionSource cdmaSub) {
 #if VDBG
-    RLOGD("setCdmaSubscriptionSource: serial %d", serial);
+    RLOGE("setCdmaSubscriptionSource: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_CDMA_SET_SUBSCRIPTION_SOURCE, 1, cdmaSub);
     return Void();
@@ -1636,7 +1636,7 @@ Return<void> RadioImpl::setCdmaSubscriptionSource(int32_t serial, CdmaSubscripti
 
 Return<void> RadioImpl::setCdmaRoamingPreference(int32_t serial, CdmaRoamingType type) {
 #if VDBG
-    RLOGD("setCdmaRoamingPreference: serial %d", serial);
+    RLOGE("setCdmaRoamingPreference: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_CDMA_SET_ROAMING_PREFERENCE, 1, type);
     return Void();
@@ -1644,7 +1644,7 @@ Return<void> RadioImpl::setCdmaRoamingPreference(int32_t serial, CdmaRoamingType
 
 Return<void> RadioImpl::getCdmaRoamingPreference(int32_t serial) {
 #if VDBG
-    RLOGD("getCdmaRoamingPreference: serial %d", serial);
+    RLOGE("getCdmaRoamingPreference: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_CDMA_QUERY_ROAMING_PREFERENCE);
     return Void();
@@ -1652,7 +1652,7 @@ Return<void> RadioImpl::getCdmaRoamingPreference(int32_t serial) {
 
 Return<void> RadioImpl::setTTYMode(int32_t serial, TtyMode mode) {
 #if VDBG
-    RLOGD("setTTYMode: serial %d", serial);
+    RLOGE("setTTYMode: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_SET_TTY_MODE, 1, mode);
     return Void();
@@ -1660,7 +1660,7 @@ Return<void> RadioImpl::setTTYMode(int32_t serial, TtyMode mode) {
 
 Return<void> RadioImpl::getTTYMode(int32_t serial) {
 #if VDBG
-    RLOGD("getTTYMode: serial %d", serial);
+    RLOGE("getTTYMode: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_QUERY_TTY_MODE);
     return Void();
@@ -1668,7 +1668,7 @@ Return<void> RadioImpl::getTTYMode(int32_t serial) {
 
 Return<void> RadioImpl::setPreferredVoicePrivacy(int32_t serial, bool enable) {
 #if VDBG
-    RLOGD("setPreferredVoicePrivacy: serial %d", serial);
+    RLOGE("setPreferredVoicePrivacy: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_CDMA_SET_PREFERRED_VOICE_PRIVACY_MODE,
             1, BOOL_TO_INT(enable));
@@ -1677,7 +1677,7 @@ Return<void> RadioImpl::setPreferredVoicePrivacy(int32_t serial, bool enable) {
 
 Return<void> RadioImpl::getPreferredVoicePrivacy(int32_t serial) {
 #if VDBG
-    RLOGD("getPreferredVoicePrivacy: serial %d", serial);
+    RLOGE("getPreferredVoicePrivacy: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_CDMA_QUERY_PREFERRED_VOICE_PRIVACY_MODE);
     return Void();
@@ -1685,7 +1685,7 @@ Return<void> RadioImpl::getPreferredVoicePrivacy(int32_t serial) {
 
 Return<void> RadioImpl::sendCDMAFeatureCode(int32_t serial, const hidl_string& featureCode) {
 #if VDBG
-    RLOGD("sendCDMAFeatureCode: serial %d", serial);
+    RLOGE("sendCDMAFeatureCode: serial %d", serial);
 #endif
     dispatchString(serial, mSlotId, RIL_REQUEST_CDMA_FLASH,
             featureCode.c_str());
@@ -1695,7 +1695,7 @@ Return<void> RadioImpl::sendCDMAFeatureCode(int32_t serial, const hidl_string& f
 Return<void> RadioImpl::sendBurstDtmf(int32_t serial, const hidl_string& dtmf, int32_t on,
                                       int32_t off) {
 #if VDBG
-    RLOGD("sendBurstDtmf: serial %d", serial);
+    RLOGE("sendBurstDtmf: serial %d", serial);
 #endif
     dispatchStrings(serial, mSlotId, RIL_REQUEST_CDMA_BURST_DTMF, false,
             3, dtmf.c_str(), (std::to_string(on)).c_str(),
@@ -1736,7 +1736,7 @@ void constructCdmaSms(RIL_CDMA_SMS_Message &rcsm, const CdmaSmsMessage& sms) {
 
 Return<void> RadioImpl::sendCdmaSms(int32_t serial, const CdmaSmsMessage& sms) {
 #if VDBG
-    RLOGD("sendCdmaSms: serial %d", serial);
+    RLOGE("sendCdmaSms: serial %d", serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_CDMA_SEND_SMS);
     if (pRI == NULL) {
@@ -1752,7 +1752,7 @@ Return<void> RadioImpl::sendCdmaSms(int32_t serial, const CdmaSmsMessage& sms) {
 
 Return<void> RadioImpl::acknowledgeLastIncomingCdmaSms(int32_t serial, const CdmaSmsAck& smsAck) {
 #if VDBG
-    RLOGD("acknowledgeLastIncomingCdmaSms: serial %d", serial);
+    RLOGE("acknowledgeLastIncomingCdmaSms: serial %d", serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_CDMA_SMS_ACKNOWLEDGE);
     if (pRI == NULL) {
@@ -1770,7 +1770,7 @@ Return<void> RadioImpl::acknowledgeLastIncomingCdmaSms(int32_t serial, const Cdm
 
 Return<void> RadioImpl::getGsmBroadcastConfig(int32_t serial) {
 #if VDBG
-    RLOGD("getGsmBroadcastConfig: serial %d", serial);
+    RLOGE("getGsmBroadcastConfig: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_GSM_GET_BROADCAST_SMS_CONFIG);
     return Void();
@@ -1780,7 +1780,7 @@ Return<void> RadioImpl::setGsmBroadcastConfig(int32_t serial,
                                               const hidl_vec<GsmBroadcastSmsConfigInfo>&
                                               configInfo) {
 #if VDBG
-    RLOGD("setGsmBroadcastConfig: serial %d", serial);
+    RLOGE("setGsmBroadcastConfig: serial %d", serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId,
             RIL_REQUEST_GSM_SET_BROADCAST_SMS_CONFIG);
@@ -1808,7 +1808,7 @@ Return<void> RadioImpl::setGsmBroadcastConfig(int32_t serial,
 
 Return<void> RadioImpl::setGsmBroadcastActivation(int32_t serial, bool activate) {
 #if VDBG
-    RLOGD("setGsmBroadcastActivation: serial %d", serial);
+    RLOGE("setGsmBroadcastActivation: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_GSM_SMS_BROADCAST_ACTIVATION,
             1, BOOL_TO_INT(!activate));
@@ -1817,7 +1817,7 @@ Return<void> RadioImpl::setGsmBroadcastActivation(int32_t serial, bool activate)
 
 Return<void> RadioImpl::getCdmaBroadcastConfig(int32_t serial) {
 #if VDBG
-    RLOGD("getCdmaBroadcastConfig: serial %d", serial);
+    RLOGE("getCdmaBroadcastConfig: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_CDMA_GET_BROADCAST_SMS_CONFIG);
     return Void();
@@ -1827,7 +1827,7 @@ Return<void> RadioImpl::setCdmaBroadcastConfig(int32_t serial,
                                                const hidl_vec<CdmaBroadcastSmsConfigInfo>&
                                                configInfo) {
 #if VDBG
-    RLOGD("setCdmaBroadcastConfig: serial %d", serial);
+    RLOGE("setCdmaBroadcastConfig: serial %d", serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId,
             RIL_REQUEST_CDMA_SET_BROADCAST_SMS_CONFIG);
@@ -1853,7 +1853,7 @@ Return<void> RadioImpl::setCdmaBroadcastConfig(int32_t serial,
 
 Return<void> RadioImpl::setCdmaBroadcastActivation(int32_t serial, bool activate) {
 #if VDBG
-    RLOGD("setCdmaBroadcastActivation: serial %d", serial);
+    RLOGE("setCdmaBroadcastActivation: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_CDMA_SMS_BROADCAST_ACTIVATION,
             1, BOOL_TO_INT(!activate));
@@ -1862,7 +1862,7 @@ Return<void> RadioImpl::setCdmaBroadcastActivation(int32_t serial, bool activate
 
 Return<void> RadioImpl::getCDMASubscription(int32_t serial) {
 #if VDBG
-    RLOGD("getCDMASubscription: serial %d", serial);
+    RLOGE("getCDMASubscription: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_CDMA_SUBSCRIPTION);
     return Void();
@@ -1870,7 +1870,7 @@ Return<void> RadioImpl::getCDMASubscription(int32_t serial) {
 
 Return<void> RadioImpl::writeSmsToRuim(int32_t serial, const CdmaSmsWriteArgs& cdmaSms) {
 #if VDBG
-    RLOGD("writeSmsToRuim: serial %d", serial);
+    RLOGE("writeSmsToRuim: serial %d", serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId,
             RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM);
@@ -1888,7 +1888,7 @@ Return<void> RadioImpl::writeSmsToRuim(int32_t serial, const CdmaSmsWriteArgs& c
 
 Return<void> RadioImpl::deleteSmsOnRuim(int32_t serial, int32_t index) {
 #if VDBG
-    RLOGD("deleteSmsOnRuim: serial %d", serial);
+    RLOGE("deleteSmsOnRuim: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM, 1, index);
     return Void();
@@ -1896,7 +1896,7 @@ Return<void> RadioImpl::deleteSmsOnRuim(int32_t serial, int32_t index) {
 
 Return<void> RadioImpl::getDeviceIdentity(int32_t serial) {
 #if VDBG
-    RLOGD("getDeviceIdentity: serial %d", serial);
+    RLOGE("getDeviceIdentity: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_DEVICE_IDENTITY);
     return Void();
@@ -1904,7 +1904,7 @@ Return<void> RadioImpl::getDeviceIdentity(int32_t serial) {
 
 Return<void> RadioImpl::exitEmergencyCallbackMode(int32_t serial) {
 #if VDBG
-    RLOGD("exitEmergencyCallbackMode: serial %d", serial);
+    RLOGE("exitEmergencyCallbackMode: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_EXIT_EMERGENCY_CALLBACK_MODE);
     return Void();
@@ -1912,7 +1912,7 @@ Return<void> RadioImpl::exitEmergencyCallbackMode(int32_t serial) {
 
 Return<void> RadioImpl::getSmscAddress(int32_t serial) {
 #if VDBG
-    RLOGD("getSmscAddress: serial %d", serial);
+    RLOGE("getSmscAddress: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_SMSC_ADDRESS);
     return Void();
@@ -1920,7 +1920,7 @@ Return<void> RadioImpl::getSmscAddress(int32_t serial) {
 
 Return<void> RadioImpl::setSmscAddress(int32_t serial, const hidl_string& smsc) {
 #if VDBG
-    RLOGD("setSmscAddress: serial %d", serial);
+    RLOGE("setSmscAddress: serial %d", serial);
 #endif
     dispatchString(serial, mSlotId, RIL_REQUEST_SET_SMSC_ADDRESS,
             smsc.c_str());
@@ -1929,7 +1929,7 @@ Return<void> RadioImpl::setSmscAddress(int32_t serial, const hidl_string& smsc)
 
 Return<void> RadioImpl::reportSmsMemoryStatus(int32_t serial, bool available) {
 #if VDBG
-    RLOGD("reportSmsMemoryStatus: serial %d", serial);
+    RLOGE("reportSmsMemoryStatus: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_REPORT_SMS_MEMORY_STATUS, 1,
             BOOL_TO_INT(available));
@@ -1938,7 +1938,7 @@ Return<void> RadioImpl::reportSmsMemoryStatus(int32_t serial, bool available) {
 
 Return<void> RadioImpl::reportStkServiceIsRunning(int32_t serial) {
 #if VDBG
-    RLOGD("reportStkServiceIsRunning: serial %d", serial);
+    RLOGE("reportStkServiceIsRunning: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING);
     return Void();
@@ -1946,7 +1946,7 @@ Return<void> RadioImpl::reportStkServiceIsRunning(int32_t serial) {
 
 Return<void> RadioImpl::getCdmaSubscriptionSource(int32_t serial) {
 #if VDBG
-    RLOGD("getCdmaSubscriptionSource: serial %d", serial);
+    RLOGE("getCdmaSubscriptionSource: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_CDMA_GET_SUBSCRIPTION_SOURCE);
     return Void();
@@ -1954,7 +1954,7 @@ Return<void> RadioImpl::getCdmaSubscriptionSource(int32_t serial) {
 
 Return<void> RadioImpl::requestIsimAuthentication(int32_t serial, const hidl_string& challenge) {
 #if VDBG
-    RLOGD("requestIsimAuthentication: serial %d", serial);
+    RLOGE("requestIsimAuthentication: serial %d", serial);
 #endif
     dispatchString(serial, mSlotId, RIL_REQUEST_ISIM_AUTHENTICATION,
             challenge.c_str());
@@ -1964,7 +1964,7 @@ Return<void> RadioImpl::requestIsimAuthentication(int32_t serial, const hidl_str
 Return<void> RadioImpl::acknowledgeIncomingGsmSmsWithPdu(int32_t serial, bool success,
                                                          const hidl_string& ackPdu) {
 #if VDBG
-    RLOGD("acknowledgeIncomingGsmSmsWithPdu: serial %d", serial);
+    RLOGE("acknowledgeIncomingGsmSmsWithPdu: serial %d", serial);
 #endif
     dispatchStrings(serial, mSlotId, RIL_REQUEST_ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU, false,
             2, success ? "1" : "0", ackPdu.c_str());
@@ -1973,7 +1973,7 @@ Return<void> RadioImpl::acknowledgeIncomingGsmSmsWithPdu(int32_t serial, bool su
 
 Return<void> RadioImpl::sendEnvelopeWithStatus(int32_t serial, const hidl_string& contents) {
 #if VDBG
-    RLOGD("sendEnvelopeWithStatus: serial %d", serial);
+    RLOGE("sendEnvelopeWithStatus: serial %d", serial);
 #endif
     dispatchString(serial, mSlotId, RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS,
             contents.c_str());
@@ -1982,7 +1982,7 @@ Return<void> RadioImpl::sendEnvelopeWithStatus(int32_t serial, const hidl_string
 
 Return<void> RadioImpl::getVoiceRadioTechnology(int32_t serial) {
 #if VDBG
-    RLOGD("getVoiceRadioTechnology: serial %d", serial);
+    RLOGE("getVoiceRadioTechnology: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_VOICE_RADIO_TECH);
     return Void();
@@ -1990,7 +1990,7 @@ Return<void> RadioImpl::getVoiceRadioTechnology(int32_t serial) {
 
 Return<void> RadioImpl::getCellInfoList(int32_t serial) {
 #if VDBG
-    RLOGD("getCellInfoList: serial %d", serial);
+    RLOGE("getCellInfoList: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_CELL_INFO_LIST);
     return Void();
@@ -1998,7 +1998,7 @@ Return<void> RadioImpl::getCellInfoList(int32_t serial) {
 
 Return<void> RadioImpl::setCellInfoListRate(int32_t serial, int32_t rate) {
 #if VDBG
-    RLOGD("setCellInfoListRate: serial %d", serial);
+    RLOGE("setCellInfoListRate: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE, 1, rate);
     return Void();
@@ -2007,7 +2007,7 @@ Return<void> RadioImpl::setCellInfoListRate(int32_t serial, int32_t rate) {
 Return<void> RadioImpl::setInitialAttachApn(int32_t serial, const DataProfileInfo& dataProfileInfo,
                                             bool modemCognitive, bool isRoaming) {
 #if VDBG
-    RLOGD("setInitialAttachApn: serial %d", serial);
+    RLOGE("setInitialAttachApn: serial %d", serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId,
             RIL_REQUEST_SET_INITIAL_ATTACH_APN);
@@ -2095,7 +2095,7 @@ Return<void> RadioImpl::setInitialAttachApn(int32_t serial, const DataProfileInf
 
 Return<void> RadioImpl::getImsRegistrationState(int32_t serial) {
 #if VDBG
-    RLOGD("getImsRegistrationState: serial %d", serial);
+    RLOGE("getImsRegistrationState: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_IMS_REGISTRATION_STATE);
     return Void();
@@ -2192,7 +2192,7 @@ bool dispatchImsCdmaSms(const ImsSmsMessage& message, RequestInfo *pRI) {
 
 Return<void> RadioImpl::sendImsSms(int32_t serial, const ImsSmsMessage& message) {
 #if VDBG
-    RLOGD("sendImsSms: serial %d", serial);
+    RLOGE("sendImsSms: serial %d", serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_IMS_SEND_SMS);
     if (pRI == NULL) {
@@ -2215,7 +2215,7 @@ Return<void> RadioImpl::sendImsSms(int32_t serial, const ImsSmsMessage& message)
 
 Return<void> RadioImpl::iccTransmitApduBasicChannel(int32_t serial, const SimApdu& message) {
 #if VDBG
-    RLOGD("iccTransmitApduBasicChannel: serial %d", serial);
+    RLOGE("iccTransmitApduBasicChannel: serial %d", serial);
 #endif
     dispatchIccApdu(serial, mSlotId, RIL_REQUEST_SIM_TRANSMIT_APDU_BASIC, message);
     return Void();
@@ -2223,7 +2223,7 @@ Return<void> RadioImpl::iccTransmitApduBasicChannel(int32_t serial, const SimApd
 
 Return<void> RadioImpl::iccOpenLogicalChannel(int32_t serial, const hidl_string& aid, int32_t p2) {
 #if VDBG
-    RLOGD("iccOpenLogicalChannel: serial %d", serial);
+    RLOGE("iccOpenLogicalChannel: serial %d", serial);
 #endif
     if (s_vendorFunctions->version < 15) {
         dispatchString(serial, mSlotId, RIL_REQUEST_SIM_OPEN_CHANNEL, aid.c_str());
@@ -2250,7 +2250,7 @@ Return<void> RadioImpl::iccOpenLogicalChannel(int32_t serial, const hidl_string&
 
 Return<void> RadioImpl::iccCloseLogicalChannel(int32_t serial, int32_t channelId) {
 #if VDBG
-    RLOGD("iccCloseLogicalChannel: serial %d", serial);
+    RLOGE("iccCloseLogicalChannel: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_SIM_CLOSE_CHANNEL, 1, channelId);
     return Void();
@@ -2258,7 +2258,7 @@ Return<void> RadioImpl::iccCloseLogicalChannel(int32_t serial, int32_t channelId
 
 Return<void> RadioImpl::iccTransmitApduLogicalChannel(int32_t serial, const SimApdu& message) {
 #if VDBG
-    RLOGD("iccTransmitApduLogicalChannel: serial %d", serial);
+    RLOGE("iccTransmitApduLogicalChannel: serial %d", serial);
 #endif
     dispatchIccApdu(serial, mSlotId, RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL, message);
     return Void();
@@ -2266,7 +2266,7 @@ Return<void> RadioImpl::iccTransmitApduLogicalChannel(int32_t serial, const SimA
 
 Return<void> RadioImpl::nvReadItem(int32_t serial, NvItem itemId) {
 #if VDBG
-    RLOGD("nvReadItem: serial %d", serial);
+    RLOGE("nvReadItem: serial %d", serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_NV_READ_ITEM);
     if (pRI == NULL) {
@@ -2282,7 +2282,7 @@ Return<void> RadioImpl::nvReadItem(int32_t serial, NvItem itemId) {
 
 Return<void> RadioImpl::nvWriteItem(int32_t serial, const NvWriteItem& item) {
 #if VDBG
-    RLOGD("nvWriteItem: serial %d", serial);
+    RLOGE("nvWriteItem: serial %d", serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_NV_WRITE_ITEM);
     if (pRI == NULL) {
@@ -2305,7 +2305,7 @@ Return<void> RadioImpl::nvWriteItem(int32_t serial, const NvWriteItem& item) {
 
 Return<void> RadioImpl::nvWriteCdmaPrl(int32_t serial, const hidl_vec<uint8_t>& prl) {
 #if VDBG
-    RLOGD("nvWriteCdmaPrl: serial %d", serial);
+    RLOGE("nvWriteCdmaPrl: serial %d", serial);
 #endif
     dispatchRaw(serial, mSlotId, RIL_REQUEST_NV_WRITE_CDMA_PRL, prl);
     return Void();
@@ -2314,7 +2314,7 @@ Return<void> RadioImpl::nvWriteCdmaPrl(int32_t serial, const hidl_vec<uint8_t>&
 Return<void> RadioImpl::nvResetConfig(int32_t serial, ResetNvType resetType) {
     int rilResetType = -1;
 #if VDBG
-    RLOGD("nvResetConfig: serial %d", serial);
+    RLOGE("nvResetConfig: serial %d", serial);
 #endif
     /* Convert ResetNvType to RIL.h values
      * RIL_REQUEST_NV_RESET_CONFIG
@@ -2339,7 +2339,7 @@ Return<void> RadioImpl::nvResetConfig(int32_t serial, ResetNvType resetType) {
 
 Return<void> RadioImpl::setUiccSubscription(int32_t serial, const SelectUiccSub& uiccSub) {
 #if VDBG
-    RLOGD("setUiccSubscription: serial %d", serial);
+    RLOGE("setUiccSubscription: serial %d", serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId,
             RIL_REQUEST_SET_UICC_SUBSCRIPTION);
@@ -2360,7 +2360,7 @@ Return<void> RadioImpl::setUiccSubscription(int32_t serial, const SelectUiccSub&
 
 Return<void> RadioImpl::setDataAllowed(int32_t serial, bool allow) {
 #if VDBG
-    RLOGD("setDataAllowed: serial %d", serial);
+    RLOGE("setDataAllowed: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_ALLOW_DATA, 1, BOOL_TO_INT(allow));
     return Void();
@@ -2368,7 +2368,7 @@ Return<void> RadioImpl::setDataAllowed(int32_t serial, bool allow) {
 
 Return<void> RadioImpl::getHardwareConfig(int32_t serial) {
 #if VDBG
-    RLOGD("getHardwareConfig: serial %d", serial);
+    RLOGE("getHardwareConfig: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_HARDWARE_CONFIG);
     return Void();
@@ -2377,7 +2377,7 @@ Return<void> RadioImpl::getHardwareConfig(int32_t serial) {
 Return<void> RadioImpl::requestIccSimAuthentication(int32_t serial, int32_t authContext,
         const hidl_string& authData, const hidl_string& aid) {
 #if VDBG
-    RLOGD("requestIccSimAuthentication: serial %d", serial);
+    RLOGE("requestIccSimAuthentication: serial %d", serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_SIM_AUTHENTICATION);
     if (pRI == NULL) {
@@ -2440,7 +2440,7 @@ void freeSetDataProfileData(int numProfiles, T *dataProfiles, T **dataProfilePtr
 Return<void> RadioImpl::setDataProfile(int32_t serial, const hidl_vec<DataProfileInfo>& profiles,
                                        bool isRoaming) {
 #if VDBG
-    RLOGD("setDataProfile: serial %d", serial);
+    RLOGE("setDataProfile: serial %d", serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_SET_DATA_PROFILE);
     if (pRI == NULL) {
@@ -2601,7 +2601,7 @@ Return<void> RadioImpl::setDataProfile(int32_t serial, const hidl_vec<DataProfil
 
 Return<void> RadioImpl::requestShutdown(int32_t serial) {
 #if VDBG
-    RLOGD("requestShutdown: serial %d", serial);
+    RLOGE("requestShutdown: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_SHUTDOWN);
     return Void();
@@ -2609,7 +2609,7 @@ Return<void> RadioImpl::requestShutdown(int32_t serial) {
 
 Return<void> RadioImpl::getRadioCapability(int32_t serial) {
 #if VDBG
-    RLOGD("getRadioCapability: serial %d", serial);
+    RLOGE("getRadioCapability: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_RADIO_CAPABILITY);
     return Void();
@@ -2617,7 +2617,7 @@ Return<void> RadioImpl::getRadioCapability(int32_t serial) {
 
 Return<void> RadioImpl::setRadioCapability(int32_t serial, const RadioCapability& rc) {
 #if VDBG
-    RLOGD("setRadioCapability: serial %d", serial);
+    RLOGE("setRadioCapability: serial %d", serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_SET_RADIO_CAPABILITY);
     if (pRI == NULL) {
@@ -2640,7 +2640,7 @@ Return<void> RadioImpl::setRadioCapability(int32_t serial, const RadioCapability
 
 Return<void> RadioImpl::startLceService(int32_t serial, int32_t reportInterval, bool pullMode) {
 #if VDBG
-    RLOGD("startLceService: serial %d", serial);
+    RLOGE("startLceService: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_START_LCE, 2, reportInterval,
             BOOL_TO_INT(pullMode));
@@ -2649,7 +2649,7 @@ Return<void> RadioImpl::startLceService(int32_t serial, int32_t reportInterval,
 
 Return<void> RadioImpl::stopLceService(int32_t serial) {
 #if VDBG
-    RLOGD("stopLceService: serial %d", serial);
+    RLOGE("stopLceService: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_STOP_LCE);
     return Void();
@@ -2657,7 +2657,7 @@ Return<void> RadioImpl::stopLceService(int32_t serial) {
 
 Return<void> RadioImpl::pullLceData(int32_t serial) {
 #if VDBG
-    RLOGD("pullLceData: serial %d", serial);
+    RLOGE("pullLceData: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_PULL_LCEDATA);
     return Void();
@@ -2665,7 +2665,7 @@ Return<void> RadioImpl::pullLceData(int32_t serial) {
 
 Return<void> RadioImpl::getModemActivityInfo(int32_t serial) {
 #if VDBG
-    RLOGD("getModemActivityInfo: serial %d", serial);
+    RLOGE("getModemActivityInfo: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_ACTIVITY_INFO);
     return Void();
@@ -2674,7 +2674,7 @@ Return<void> RadioImpl::getModemActivityInfo(int32_t serial) {
 Return<void> RadioImpl::setAllowedCarriers(int32_t serial, bool allAllowed,
                                            const CarrierRestrictions& carriers) {
 #if VDBG
-    RLOGD("setAllowedCarriers: serial %d", serial);
+    RLOGE("setAllowedCarriers: serial %d", serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId,
             RIL_REQUEST_SET_CARRIER_RESTRICTIONS);
@@ -2738,7 +2738,7 @@ Return<void> RadioImpl::setAllowedCarriers(int32_t serial, bool allAllowed,
 
 Return<void> RadioImpl::getAllowedCarriers(int32_t serial) {
 #if VDBG
-    RLOGD("getAllowedCarriers: serial %d", serial);
+    RLOGE("getAllowedCarriers: serial %d", serial);
 #endif
     dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_CARRIER_RESTRICTIONS);
     return Void();
@@ -2747,11 +2747,11 @@ Return<void> RadioImpl::getAllowedCarriers(int32_t serial) {
 Return<void> RadioImpl::sendDeviceState(int32_t serial, DeviceStateType deviceStateType,
                                         bool state) {
 #if VDBG
-    RLOGD("sendDeviceState: serial %d", serial);
+    RLOGE("sendDeviceState: serial %d", serial);
 #endif
     if (s_vendorFunctions->version < 15) {
         if (deviceStateType ==  DeviceStateType::LOW_DATA_EXPECTED) {
-            RLOGD("sendDeviceState: calling screen state %d", BOOL_TO_INT(!state));
+            RLOGE("sendDeviceState: calling screen state %d", BOOL_TO_INT(!state));
             dispatchInts(serial, mSlotId, RIL_REQUEST_SCREEN_STATE, 1, BOOL_TO_INT(!state));
         } else {
             RequestInfo *pRI = android::addRequestToList(serial, mSlotId,
@@ -2767,7 +2767,7 @@ Return<void> RadioImpl::sendDeviceState(int32_t serial, DeviceStateType deviceSt
 
 Return<void> RadioImpl::setIndicationFilter(int32_t serial, int32_t indicationFilter) {
 #if VDBG
-    RLOGD("setIndicationFilter: serial %d", serial);
+    RLOGE("setIndicationFilter: serial %d", serial);
 #endif
     if (s_vendorFunctions->version < 15) {
         RequestInfo *pRI = android::addRequestToList(serial, mSlotId,
@@ -2781,7 +2781,7 @@ Return<void> RadioImpl::setIndicationFilter(int32_t serial, int32_t indicationFi
 
 Return<void> RadioImpl::setSimCardPower(int32_t serial, bool powerUp) {
 #if VDBG
-    RLOGD("setSimCardPower: serial %d", serial);
+    RLOGE("setSimCardPower: serial %d", serial);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_SET_SIM_CARD_POWER, 1, BOOL_TO_INT(powerUp));
     return Void();
@@ -2789,7 +2789,7 @@ Return<void> RadioImpl::setSimCardPower(int32_t serial, bool powerUp) {
 
 Return<void> RadioImpl::setSimCardPower_1_1(int32_t serial, const V1_1::CardPowerState state) {
 #if VDBG
-    RLOGD("setSimCardPower_1_1: serial %d state %d", serial, state);
+    RLOGE("setSimCardPower_1_1: serial %d state %d", serial, state);
 #endif
     dispatchInts(serial, mSlotId, RIL_REQUEST_SET_SIM_CARD_POWER, 1, state);
     return Void();
@@ -2798,7 +2798,7 @@ Return<void> RadioImpl::setSimCardPower_1_1(int32_t serial, const V1_1::CardPowe
 Return<void> RadioImpl::setCarrierInfoForImsiEncryption(int32_t serial,
         const V1_1::ImsiEncryptionInfo& data) {
 #if VDBG
-    RLOGD("setCarrierInfoForImsiEncryption: serial %d", serial);
+    RLOGE("setCarrierInfoForImsiEncryption: serial %d", serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(
             serial, mSlotId, RIL_REQUEST_SET_CARRIER_INFO_IMSI_ENCRYPTION);
@@ -2831,7 +2831,7 @@ Return<void> RadioImpl::setCarrierInfoForImsiEncryption(int32_t serial,
 
 Return<void> RadioImpl::startKeepalive(int32_t serial, const V1_1::KeepaliveRequest& keepalive) {
 #if VDBG
-    RLOGD("%s(): %d", __FUNCTION__, serial);
+    RLOGE("%s(): %d", __FUNCTION__, serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_START_KEEPALIVE);
     if (pRI == NULL) {
@@ -2880,7 +2880,7 @@ Return<void> RadioImpl::startKeepalive(int32_t serial, const V1_1::KeepaliveRequ
 
 Return<void> RadioImpl::stopKeepalive(int32_t serial, int32_t sessionHandle) {
 #if VDBG
-    RLOGD("%s(): %d", __FUNCTION__, serial);
+    RLOGE("%s(): %d", __FUNCTION__, serial);
 #endif
     RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_STOP_KEEPALIVE);
     if (pRI == NULL) {
@@ -2900,7 +2900,7 @@ Return<void> OemHookImpl::setResponseFunctions(
         const ::android::sp<IOemHookResponse>& oemHookResponseParam,
         const ::android::sp<IOemHookIndication>& oemHookIndicationParam) {
 #if VDBG
-    RLOGD("OemHookImpl::setResponseFunctions");
+    RLOGE("OemHookImpl::setResponseFunctions");
 #endif
 
     pthread_rwlock_t *radioServiceRwlockPtr = radio::getRadioServiceRwlock(mSlotId);
@@ -2919,7 +2919,7 @@ Return<void> OemHookImpl::setResponseFunctions(
 
 Return<void> OemHookImpl::sendRequestRaw(int32_t serial, const hidl_vec<uint8_t>& data) {
 #if VDBG
-    RLOGD("OemHookImpl::sendRequestRaw: serial %d", serial);
+    RLOGE("OemHookImpl::sendRequestRaw: serial %d", serial);
 #endif
     dispatchRaw(serial, mSlotId, RIL_REQUEST_OEM_HOOK_RAW, data);
     return Void();
@@ -2928,7 +2928,7 @@ Return<void> OemHookImpl::sendRequestRaw(int32_t serial, const hidl_vec<uint8_t>
 Return<void> OemHookImpl::sendRequestStrings(int32_t serial,
         const hidl_vec<hidl_string>& data) {
 #if VDBG
-    RLOGD("OemHookImpl::sendRequestStrings: serial %d", serial);
+    RLOGE("OemHookImpl::sendRequestStrings: serial %d", serial);
 #endif
     dispatchStrings(serial, mSlotId, RIL_REQUEST_OEM_HOOK_STRINGS, data);
     return Void();
@@ -3022,7 +3022,7 @@ int radio::getIccCardStatusResponse(int slotId,
             cardStatus.applications.resize(p_cur->num_applications);
             AppStatus *appStatus = cardStatus.applications.data();
 #if VDBG
-            RLOGD("getIccCardStatusResponse: num_applications %d", p_cur->num_applications);
+            RLOGE("getIccCardStatusResponse: num_applications %d", p_cur->num_applications);
 #endif
             for (int i = 0; i < p_cur->num_applications; i++) {
                 appStatus[i].appType = (AppType) rilAppStatus[i].app_type;
@@ -3051,7 +3051,7 @@ int radio::supplyIccPinForAppResponse(int slotId,
                                      int responseType, int serial, RIL_Errno e,
                                      void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("supplyIccPinForAppResponse: serial %d", serial);
+    RLOGE("supplyIccPinForAppResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3073,7 +3073,7 @@ int radio::supplyIccPukForAppResponse(int slotId,
                                      int responseType, int serial, RIL_Errno e,
                                      void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("supplyIccPukForAppResponse: serial %d", serial);
+    RLOGE("supplyIccPukForAppResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3094,7 +3094,7 @@ int radio::supplyIccPin2ForAppResponse(int slotId,
                                       int responseType, int serial, RIL_Errno e,
                                       void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("supplyIccPin2ForAppResponse: serial %d", serial);
+    RLOGE("supplyIccPin2ForAppResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3115,7 +3115,7 @@ int radio::supplyIccPuk2ForAppResponse(int slotId,
                                       int responseType, int serial, RIL_Errno e,
                                       void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("supplyIccPuk2ForAppResponse: serial %d", serial);
+    RLOGE("supplyIccPuk2ForAppResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3136,7 +3136,7 @@ int radio::changeIccPinForAppResponse(int slotId,
                                      int responseType, int serial, RIL_Errno e,
                                      void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("changeIccPinForAppResponse: serial %d", serial);
+    RLOGE("changeIccPinForAppResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3157,7 +3157,7 @@ int radio::changeIccPin2ForAppResponse(int slotId,
                                       int responseType, int serial, RIL_Errno e,
                                       void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("changeIccPin2ForAppResponse: serial %d", serial);
+    RLOGE("changeIccPin2ForAppResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3178,7 +3178,7 @@ int radio::supplyNetworkDepersonalizationResponse(int slotId,
                                                  int responseType, int serial, RIL_Errno e,
                                                  void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("supplyNetworkDepersonalizationResponse: serial %d", serial);
+    RLOGE("supplyNetworkDepersonalizationResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3199,7 +3199,7 @@ int radio::getCurrentCallsResponse(int slotId,
                                   int responseType, int serial, RIL_Errno e,
                                   void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getCurrentCallsResponse: serial %d", serial);
+    RLOGE("getCurrentCallsResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3257,7 +3257,7 @@ int radio::dialResponse(int slotId,
                        int responseType, int serial, RIL_Errno e, void *response,
                        size_t responseLen) {
 #if VDBG
-    RLOGD("dialResponse: serial %d", serial);
+    RLOGE("dialResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3276,7 +3276,7 @@ int radio::getIMSIForAppResponse(int slotId,
                                 int responseType, int serial, RIL_Errno e, void *response,
                                 size_t responseLen) {
 #if VDBG
-    RLOGD("getIMSIForAppResponse: serial %d", serial);
+    RLOGE("getIMSIForAppResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3297,7 +3297,7 @@ int radio::hangupConnectionResponse(int slotId,
                                    int responseType, int serial, RIL_Errno e,
                                    void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("hangupConnectionResponse: serial %d", serial);
+    RLOGE("hangupConnectionResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3318,7 +3318,7 @@ int radio::hangupWaitingOrBackgroundResponse(int slotId,
                                             int responseType, int serial, RIL_Errno e,
                                             void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("hangupWaitingOrBackgroundResponse: serial %d", serial);
+    RLOGE("hangupWaitingOrBackgroundResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3340,7 +3340,7 @@ int radio::hangupForegroundResumeBackgroundResponse(int slotId, int responseType
                                                     RIL_Errno e, void *response,
                                                     size_t responseLen) {
 #if VDBG
-    RLOGD("hangupWaitingOrBackgroundResponse: serial %d", serial);
+    RLOGE("hangupWaitingOrBackgroundResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3362,7 +3362,7 @@ int radio::switchWaitingOrHoldingAndActiveResponse(int slotId, int responseType,
                                                    RIL_Errno e, void *response,
                                                    size_t responseLen) {
 #if VDBG
-    RLOGD("switchWaitingOrHoldingAndActiveResponse: serial %d", serial);
+    RLOGE("switchWaitingOrHoldingAndActiveResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3383,7 +3383,7 @@ int radio::switchWaitingOrHoldingAndActiveResponse(int slotId, int responseType,
 int radio::conferenceResponse(int slotId, int responseType,
                              int serial, RIL_Errno e, void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("conferenceResponse: serial %d", serial);
+    RLOGE("conferenceResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3403,7 +3403,7 @@ int radio::conferenceResponse(int slotId, int responseType,
 int radio::rejectCallResponse(int slotId, int responseType,
                              int serial, RIL_Errno e, void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("rejectCallResponse: serial %d", serial);
+    RLOGE("rejectCallResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3424,7 +3424,7 @@ int radio::getLastCallFailCauseResponse(int slotId,
                                        int responseType, int serial, RIL_Errno e, void *response,
                                        size_t responseLen) {
 #if VDBG
-    RLOGD("getLastCallFailCauseResponse: serial %d", serial);
+    RLOGE("getLastCallFailCauseResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3463,7 +3463,7 @@ int radio::getSignalStrengthResponse(int slotId,
                                      int responseType, int serial, RIL_Errno e,
                                      void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getSignalStrengthResponse: serial %d", serial);
+    RLOGE("getSignalStrengthResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3782,7 +3782,7 @@ int radio::getVoiceRegistrationStateResponse(int slotId,
                                             int responseType, int serial, RIL_Errno e,
                                             void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getVoiceRegistrationStateResponse: serial %d", serial);
+    RLOGE("getVoiceRegistrationStateResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3846,7 +3846,7 @@ int radio::getDataRegistrationStateResponse(int slotId,
                                            int responseType, int serial, RIL_Errno e,
                                            void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getDataRegistrationStateResponse: serial %d", serial);
+    RLOGE("getDataRegistrationStateResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3902,7 +3902,7 @@ int radio::getOperatorResponse(int slotId,
                               int responseType, int serial, RIL_Errno e, void *response,
                               size_t responseLen) {
 #if VDBG
-    RLOGD("getOperatorResponse: serial %d", serial);
+    RLOGE("getOperatorResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -3936,7 +3936,7 @@ int radio::getOperatorResponse(int slotId,
 int radio::setRadioPowerResponse(int slotId,
                                 int responseType, int serial, RIL_Errno e, void *response,
                                 size_t responseLen) {
-    RLOGD("setRadioPowerResponse: serial %d", serial);
+    RLOGE("setRadioPowerResponse: serial %d", serial);
 
     if (radioService[slotId]->mRadioResponse != NULL) {
         RadioResponseInfo responseInfo = {};
@@ -3956,7 +3956,7 @@ int radio::sendDtmfResponse(int slotId,
                            int responseType, int serial, RIL_Errno e, void *response,
                            size_t responseLen) {
 #if VDBG
-    RLOGD("sendDtmfResponse: serial %d", serial);
+    RLOGE("sendDtmfResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4000,7 +4000,7 @@ int radio::sendSmsResponse(int slotId,
                           int responseType, int serial, RIL_Errno e, void *response,
                           size_t responseLen) {
 #if VDBG
-    RLOGD("sendSmsResponse: serial %d", serial);
+    RLOGE("sendSmsResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4022,7 +4022,7 @@ int radio::sendSMSExpectMoreResponse(int slotId,
                                     int responseType, int serial, RIL_Errno e, void *response,
                                     size_t responseLen) {
 #if VDBG
-    RLOGD("sendSMSExpectMoreResponse: serial %d", serial);
+    RLOGE("sendSMSExpectMoreResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4044,7 +4044,7 @@ int radio::setupDataCallResponse(int slotId,
                                  int responseType, int serial, RIL_Errno e, void *response,
                                  size_t responseLen) {
 #if VDBG
-    RLOGD("setupDataCallResponse: serial %d", serial);
+    RLOGE("setupDataCallResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4107,7 +4107,7 @@ int radio::iccIOForAppResponse(int slotId,
                       int responseType, int serial, RIL_Errno e, void *response,
                       size_t responseLen) {
 #if VDBG
-    RLOGD("iccIOForAppResponse: serial %d", serial);
+    RLOGE("iccIOForAppResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4129,7 +4129,7 @@ int radio::sendUssdResponse(int slotId,
                            int responseType, int serial, RIL_Errno e, void *response,
                            size_t responseLen) {
 #if VDBG
-    RLOGD("sendUssdResponse: serial %d", serial);
+    RLOGE("sendUssdResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4150,7 +4150,7 @@ int radio::cancelPendingUssdResponse(int slotId,
                                     int responseType, int serial, RIL_Errno e, void *response,
                                     size_t responseLen) {
 #if VDBG
-    RLOGD("cancelPendingUssdResponse: serial %d", serial);
+    RLOGE("cancelPendingUssdResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4171,7 +4171,7 @@ int radio::getClirResponse(int slotId,
                               int responseType, int serial, RIL_Errno e, void *response,
                               size_t responseLen) {
 #if VDBG
-    RLOGD("getClirResponse: serial %d", serial);
+    RLOGE("getClirResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4201,7 +4201,7 @@ int radio::setClirResponse(int slotId,
                           int responseType, int serial, RIL_Errno e, void *response,
                           size_t responseLen) {
 #if VDBG
-    RLOGD("setClirResponse: serial %d", serial);
+    RLOGE("setClirResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4221,7 +4221,7 @@ int radio::getCallForwardStatusResponse(int slotId,
                                        int responseType, int serial, RIL_Errno e,
                                        void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getCallForwardStatusResponse: serial %d", serial);
+    RLOGE("getCallForwardStatusResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4262,7 +4262,7 @@ int radio::setCallForwardResponse(int slotId,
                                  int responseType, int serial, RIL_Errno e, void *response,
                                  size_t responseLen) {
 #if VDBG
-    RLOGD("setCallForwardResponse: serial %d", serial);
+    RLOGE("setCallForwardResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4282,7 +4282,7 @@ int radio::getCallWaitingResponse(int slotId,
                                  int responseType, int serial, RIL_Errno e, void *response,
                                  size_t responseLen) {
 #if VDBG
-    RLOGD("getCallWaitingResponse: serial %d", serial);
+    RLOGE("getCallWaitingResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4313,7 +4313,7 @@ int radio::setCallWaitingResponse(int slotId,
                                  int responseType, int serial, RIL_Errno e, void *response,
                                  size_t responseLen) {
 #if VDBG
-    RLOGD("setCallWaitingResponse: serial %d", serial);
+    RLOGE("setCallWaitingResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4333,7 +4333,7 @@ int radio::acknowledgeLastIncomingGsmSmsResponse(int slotId,
                                                 int responseType, int serial, RIL_Errno e,
                                                 void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("acknowledgeLastIncomingGsmSmsResponse: serial %d", serial);
+    RLOGE("acknowledgeLastIncomingGsmSmsResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4355,7 +4355,7 @@ int radio::acceptCallResponse(int slotId,
                              int responseType, int serial, RIL_Errno e,
                              void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("acceptCallResponse: serial %d", serial);
+    RLOGE("acceptCallResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4376,7 +4376,7 @@ int radio::deactivateDataCallResponse(int slotId,
                                                 int responseType, int serial, RIL_Errno e,
                                                 void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("deactivateDataCallResponse: serial %d", serial);
+    RLOGE("deactivateDataCallResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4397,7 +4397,7 @@ int radio::getFacilityLockForAppResponse(int slotId,
                                         int responseType, int serial, RIL_Errno e,
                                         void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getFacilityLockForAppResponse: serial %d", serial);
+    RLOGE("getFacilityLockForAppResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4418,7 +4418,7 @@ int radio::setFacilityLockForAppResponse(int slotId,
                                       int responseType, int serial, RIL_Errno e,
                                       void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setFacilityLockForAppResponse: serial %d", serial);
+    RLOGE("setFacilityLockForAppResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4440,7 +4440,7 @@ int radio::setBarringPasswordResponse(int slotId,
                              int responseType, int serial, RIL_Errno e,
                              void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("acceptCallResponse: serial %d", serial);
+    RLOGE("acceptCallResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4461,7 +4461,7 @@ int radio::getNetworkSelectionModeResponse(int slotId,
                                           int responseType, int serial, RIL_Errno e, void *response,
                                           size_t responseLen) {
 #if VDBG
-    RLOGD("getNetworkSelectionModeResponse: serial %d", serial);
+    RLOGE("getNetworkSelectionModeResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4492,7 +4492,7 @@ int radio::setNetworkSelectionModeAutomaticResponse(int slotId, int responseType
                                                     RIL_Errno e, void *response,
                                                     size_t responseLen) {
 #if VDBG
-    RLOGD("setNetworkSelectionModeAutomaticResponse: serial %d", serial);
+    RLOGE("setNetworkSelectionModeAutomaticResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4514,7 +4514,7 @@ int radio::setNetworkSelectionModeManualResponse(int slotId,
                              int responseType, int serial, RIL_Errno e,
                              void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setNetworkSelectionModeManualResponse: serial %d", serial);
+    RLOGE("setNetworkSelectionModeManualResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4550,7 +4550,7 @@ int radio::getAvailableNetworksResponse(int slotId,
                               int responseType, int serial, RIL_Errno e, void *response,
                               size_t responseLen) {
 #if VDBG
-    RLOGD("getAvailableNetworksResponse: serial %d", serial);
+    RLOGE("getAvailableNetworksResponse: serial %d", serial);
 #endif
     int qanRespStrings = property_get_int32("ro.ril.telephony.qan_resp_strings", 4);
 
@@ -4594,7 +4594,7 @@ int radio::startDtmfResponse(int slotId,
                             int responseType, int serial, RIL_Errno e,
                             void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("startDtmfResponse: serial %d", serial);
+    RLOGE("startDtmfResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4614,7 +4614,7 @@ int radio::stopDtmfResponse(int slotId,
                            int responseType, int serial, RIL_Errno e,
                            void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("stopDtmfResponse: serial %d", serial);
+    RLOGE("stopDtmfResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4634,7 +4634,7 @@ int radio::getBasebandVersionResponse(int slotId,
                                      int responseType, int serial, RIL_Errno e,
                                      void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getBasebandVersionResponse: serial %d", serial);
+    RLOGE("getBasebandVersionResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4655,7 +4655,7 @@ int radio::separateConnectionResponse(int slotId,
                                      int responseType, int serial, RIL_Errno e,
                                      void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("separateConnectionResponse: serial %d", serial);
+    RLOGE("separateConnectionResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4676,7 +4676,7 @@ int radio::setMuteResponse(int slotId,
                           int responseType, int serial, RIL_Errno e,
                           void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setMuteResponse: serial %d", serial);
+    RLOGE("setMuteResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4696,7 +4696,7 @@ int radio::getMuteResponse(int slotId,
                           int responseType, int serial, RIL_Errno e, void *response,
                           size_t responseLen) {
 #if VDBG
-    RLOGD("getMuteResponse: serial %d", serial);
+    RLOGE("getMuteResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4724,7 +4724,7 @@ int radio::getClipResponse(int slotId,
                           int responseType, int serial, RIL_Errno e,
                           void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getClipResponse: serial %d", serial);
+    RLOGE("getClipResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4744,7 +4744,7 @@ int radio::getDataCallListResponse(int slotId,
                                    int responseType, int serial, RIL_Errno e,
                                    void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getDataCallListResponse: serial %d", serial);
+    RLOGE("getDataCallListResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4776,7 +4776,7 @@ int radio::setSuppServiceNotificationsResponse(int slotId,
                                               int responseType, int serial, RIL_Errno e,
                                               void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setSuppServiceNotificationsResponse: serial %d", serial);
+    RLOGE("setSuppServiceNotificationsResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4798,7 +4798,7 @@ int radio::deleteSmsOnSimResponse(int slotId,
                                  int responseType, int serial, RIL_Errno e,
                                  void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("deleteSmsOnSimResponse: serial %d", serial);
+    RLOGE("deleteSmsOnSimResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4818,7 +4818,7 @@ int radio::setBandModeResponse(int slotId,
                               int responseType, int serial, RIL_Errno e,
                               void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setBandModeResponse: serial %d", serial);
+    RLOGE("setBandModeResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4838,7 +4838,7 @@ int radio::writeSmsToSimResponse(int slotId,
                                 int responseType, int serial, RIL_Errno e,
                                 void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("writeSmsToSimResponse: serial %d", serial);
+    RLOGE("writeSmsToSimResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4858,7 +4858,7 @@ int radio::getAvailableBandModesResponse(int slotId,
                                         int responseType, int serial, RIL_Errno e, void *response,
                                         size_t responseLen) {
 #if VDBG
-    RLOGD("getAvailableBandModesResponse: serial %d", serial);
+    RLOGE("getAvailableBandModesResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4892,7 +4892,7 @@ int radio::sendEnvelopeResponse(int slotId,
                                int responseType, int serial, RIL_Errno e,
                                void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("sendEnvelopeResponse: serial %d", serial);
+    RLOGE("sendEnvelopeResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4913,7 +4913,7 @@ int radio::sendTerminalResponseToSimResponse(int slotId,
                                             int responseType, int serial, RIL_Errno e,
                                             void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("sendTerminalResponseToSimResponse: serial %d", serial);
+    RLOGE("sendTerminalResponseToSimResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4936,7 +4936,7 @@ int radio::handleStkCallSetupRequestFromSimResponse(int slotId,
                                                    RIL_Errno e, void *response,
                                                    size_t responseLen) {
 #if VDBG
-    RLOGD("handleStkCallSetupRequestFromSimResponse: serial %d", serial);
+    RLOGE("handleStkCallSetupRequestFromSimResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4958,7 +4958,7 @@ int radio::explicitCallTransferResponse(int slotId,
                                        int responseType, int serial, RIL_Errno e,
                                        void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("explicitCallTransferResponse: serial %d", serial);
+    RLOGE("explicitCallTransferResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -4979,7 +4979,7 @@ int radio::setPreferredNetworkTypeResponse(int slotId,
                                  int responseType, int serial, RIL_Errno e,
                                  void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setPreferredNetworkTypeResponse: serial %d", serial);
+    RLOGE("setPreferredNetworkTypeResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5002,7 +5002,7 @@ int radio::getPreferredNetworkTypeResponse(int slotId,
                                           int responseType, int serial, RIL_Errno e,
                                           void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getPreferredNetworkTypeResponse: serial %d", serial);
+    RLOGE("getPreferredNetworkTypeResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5024,7 +5024,7 @@ int radio::getNeighboringCidsResponse(int slotId,
                                      int responseType, int serial, RIL_Errno e,
                                      void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getNeighboringCidsResponse: serial %d", serial);
+    RLOGE("getNeighboringCidsResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5062,7 +5062,7 @@ int radio::setLocationUpdatesResponse(int slotId,
                                      int responseType, int serial, RIL_Errno e,
                                      void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setLocationUpdatesResponse: serial %d", serial);
+    RLOGE("setLocationUpdatesResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5083,7 +5083,7 @@ int radio::setCdmaSubscriptionSourceResponse(int slotId,
                                  int responseType, int serial, RIL_Errno e,
                                  void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setCdmaSubscriptionSourceResponse: serial %d", serial);
+    RLOGE("setCdmaSubscriptionSourceResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5105,7 +5105,7 @@ int radio::setCdmaRoamingPreferenceResponse(int slotId,
                                  int responseType, int serial, RIL_Errno e,
                                  void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setCdmaRoamingPreferenceResponse: serial %d", serial);
+    RLOGE("setCdmaRoamingPreferenceResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5127,7 +5127,7 @@ int radio::getCdmaRoamingPreferenceResponse(int slotId,
                                            int responseType, int serial, RIL_Errno e,
                                            void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getCdmaRoamingPreferenceResponse: serial %d", serial);
+    RLOGE("getCdmaRoamingPreferenceResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5149,7 +5149,7 @@ int radio::setTTYModeResponse(int slotId,
                              int responseType, int serial, RIL_Errno e,
                              void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setTTYModeResponse: serial %d", serial);
+    RLOGE("setTTYModeResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5169,7 +5169,7 @@ int radio::getTTYModeResponse(int slotId,
                              int responseType, int serial, RIL_Errno e,
                              void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getTTYModeResponse: serial %d", serial);
+    RLOGE("getTTYModeResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5190,7 +5190,7 @@ int radio::setPreferredVoicePrivacyResponse(int slotId,
                                  int responseType, int serial, RIL_Errno e,
                                  void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setPreferredVoicePrivacyResponse: serial %d", serial);
+    RLOGE("setPreferredVoicePrivacyResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5212,7 +5212,7 @@ int radio::getPreferredVoicePrivacyResponse(int slotId,
                                            int responseType, int serial, RIL_Errno e,
                                            void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getPreferredVoicePrivacyResponse: serial %d", serial);
+    RLOGE("getPreferredVoicePrivacyResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5243,7 +5243,7 @@ int radio::sendCDMAFeatureCodeResponse(int slotId,
                                  int responseType, int serial, RIL_Errno e,
                                  void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("sendCDMAFeatureCodeResponse: serial %d", serial);
+    RLOGE("sendCDMAFeatureCodeResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5264,7 +5264,7 @@ int radio::sendBurstDtmfResponse(int slotId,
                                  int responseType, int serial, RIL_Errno e,
                                  void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("sendBurstDtmfResponse: serial %d", serial);
+    RLOGE("sendBurstDtmfResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5284,7 +5284,7 @@ int radio::sendCdmaSmsResponse(int slotId,
                               int responseType, int serial, RIL_Errno e, void *response,
                               size_t responseLen) {
 #if VDBG
-    RLOGD("sendCdmaSmsResponse: serial %d", serial);
+    RLOGE("sendCdmaSmsResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5306,7 +5306,7 @@ int radio::acknowledgeLastIncomingCdmaSmsResponse(int slotId,
                                                  int responseType, int serial, RIL_Errno e,
                                                  void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("acknowledgeLastIncomingCdmaSmsResponse: serial %d", serial);
+    RLOGE("acknowledgeLastIncomingCdmaSmsResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5328,7 +5328,7 @@ int radio::getGsmBroadcastConfigResponse(int slotId,
                                         int responseType, int serial, RIL_Errno e,
                                         void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getGsmBroadcastConfigResponse: serial %d", serial);
+    RLOGE("getGsmBroadcastConfigResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5370,7 +5370,7 @@ int radio::setGsmBroadcastConfigResponse(int slotId,
                                         int responseType, int serial, RIL_Errno e,
                                         void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setGsmBroadcastConfigResponse: serial %d", serial);
+    RLOGE("setGsmBroadcastConfigResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5391,7 +5391,7 @@ int radio::setGsmBroadcastActivationResponse(int slotId,
                                             int responseType, int serial, RIL_Errno e,
                                             void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setGsmBroadcastActivationResponse: serial %d", serial);
+    RLOGE("setGsmBroadcastActivationResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5413,7 +5413,7 @@ int radio::getCdmaBroadcastConfigResponse(int slotId,
                                          int responseType, int serial, RIL_Errno e,
                                          void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getCdmaBroadcastConfigResponse: serial %d", serial);
+    RLOGE("getCdmaBroadcastConfigResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5453,7 +5453,7 @@ int radio::setCdmaBroadcastConfigResponse(int slotId,
                                          int responseType, int serial, RIL_Errno e,
                                          void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setCdmaBroadcastConfigResponse: serial %d", serial);
+    RLOGE("setCdmaBroadcastConfigResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5475,7 +5475,7 @@ int radio::setCdmaBroadcastActivationResponse(int slotId,
                                              int responseType, int serial, RIL_Errno e,
                                              void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setCdmaBroadcastActivationResponse: serial %d", serial);
+    RLOGE("setCdmaBroadcastActivationResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5497,7 +5497,7 @@ int radio::getCDMASubscriptionResponse(int slotId,
                                       int responseType, int serial, RIL_Errno e, void *response,
                                       size_t responseLen) {
 #if VDBG
-    RLOGD("getCDMASubscriptionResponse: serial %d", serial);
+    RLOGE("getCDMASubscriptionResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5537,7 +5537,7 @@ int radio::writeSmsToRuimResponse(int slotId,
                                  int responseType, int serial, RIL_Errno e,
                                  void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("writeSmsToRuimResponse: serial %d", serial);
+    RLOGE("writeSmsToRuimResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5557,7 +5557,7 @@ int radio::deleteSmsOnRuimResponse(int slotId,
                                   int responseType, int serial, RIL_Errno e,
                                   void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("deleteSmsOnRuimResponse: serial %d", serial);
+    RLOGE("deleteSmsOnRuimResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5577,7 +5577,7 @@ int radio::getDeviceIdentityResponse(int slotId,
                                     int responseType, int serial, RIL_Errno e, void *response,
                                     size_t responseLen) {
 #if VDBG
-    RLOGD("getDeviceIdentityResponse: serial %d", serial);
+    RLOGE("getDeviceIdentityResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5615,7 +5615,7 @@ int radio::exitEmergencyCallbackModeResponse(int slotId,
                                             int responseType, int serial, RIL_Errno e,
                                             void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("exitEmergencyCallbackModeResponse: serial %d", serial);
+    RLOGE("exitEmergencyCallbackModeResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5637,7 +5637,7 @@ int radio::getSmscAddressResponse(int slotId,
                                   int responseType, int serial, RIL_Errno e,
                                   void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getSmscAddressResponse: serial %d", serial);
+    RLOGE("getSmscAddressResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5658,7 +5658,7 @@ int radio::setSmscAddressResponse(int slotId,
                                              int responseType, int serial, RIL_Errno e,
                                              void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setSmscAddressResponse: serial %d", serial);
+    RLOGE("setSmscAddressResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5678,7 +5678,7 @@ int radio::reportSmsMemoryStatusResponse(int slotId,
                                         int responseType, int serial, RIL_Errno e,
                                         void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("reportSmsMemoryStatusResponse: serial %d", serial);
+    RLOGE("reportSmsMemoryStatusResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5699,7 +5699,7 @@ int radio::reportStkServiceIsRunningResponse(int slotId,
                                              int responseType, int serial, RIL_Errno e,
                                              void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("reportStkServiceIsRunningResponse: serial %d", serial);
+    RLOGE("reportStkServiceIsRunningResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5720,7 +5720,7 @@ int radio::getCdmaSubscriptionSourceResponse(int slotId,
                                             int responseType, int serial, RIL_Errno e,
                                             void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getCdmaSubscriptionSourceResponse: serial %d", serial);
+    RLOGE("getCdmaSubscriptionSourceResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5742,7 +5742,7 @@ int radio::requestIsimAuthenticationResponse(int slotId,
                                             int responseType, int serial, RIL_Errno e,
                                             void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("requestIsimAuthenticationResponse: serial %d", serial);
+    RLOGE("requestIsimAuthenticationResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5766,7 +5766,7 @@ int radio::acknowledgeIncomingGsmSmsWithPduResponse(int slotId,
                                                    int serial, RIL_Errno e, void *response,
                                                    size_t responseLen) {
 #if VDBG
-    RLOGD("acknowledgeIncomingGsmSmsWithPduResponse: serial %d", serial);
+    RLOGE("acknowledgeIncomingGsmSmsWithPduResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5788,7 +5788,7 @@ int radio::sendEnvelopeWithStatusResponse(int slotId,
                                          int responseType, int serial, RIL_Errno e, void *response,
                                          size_t responseLen) {
 #if VDBG
-    RLOGD("sendEnvelopeWithStatusResponse: serial %d", serial);
+    RLOGE("sendEnvelopeWithStatusResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5812,7 +5812,7 @@ int radio::getVoiceRadioTechnologyResponse(int slotId,
                                           int responseType, int serial, RIL_Errno e,
                                           void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getVoiceRadioTechnologyResponse: serial %d", serial);
+    RLOGE("getVoiceRadioTechnologyResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5835,7 +5835,7 @@ int radio::getCellInfoListResponse(int slotId,
                                    int serial, RIL_Errno e, void *response,
                                    size_t responseLen) {
 #if VDBG
-    RLOGD("getCellInfoListResponse: serial %d", serial);
+    RLOGE("getCellInfoListResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5866,7 +5866,7 @@ int radio::setCellInfoListRateResponse(int slotId,
                                        int serial, RIL_Errno e, void *response,
                                        size_t responseLen) {
 #if VDBG
-    RLOGD("setCellInfoListRateResponse: serial %d", serial);
+    RLOGE("setCellInfoListRateResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5887,7 +5887,7 @@ int radio::setInitialAttachApnResponse(int slotId,
                                        int responseType, int serial, RIL_Errno e,
                                        void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setInitialAttachApnResponse: serial %d", serial);
+    RLOGE("setInitialAttachApnResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5908,7 +5908,7 @@ int radio::getImsRegistrationStateResponse(int slotId,
                                            int responseType, int serial, RIL_Errno e,
                                            void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getImsRegistrationStateResponse: serial %d", serial);
+    RLOGE("getImsRegistrationStateResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5941,7 +5941,7 @@ int radio::sendImsSmsResponse(int slotId,
                               int responseType, int serial, RIL_Errno e, void *response,
                               size_t responseLen) {
 #if VDBG
-    RLOGD("sendImsSmsResponse: serial %d", serial);
+    RLOGE("sendImsSmsResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5963,7 +5963,7 @@ int radio::iccTransmitApduBasicChannelResponse(int slotId,
                                                int responseType, int serial, RIL_Errno e,
                                                void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("iccTransmitApduBasicChannelResponse: serial %d", serial);
+    RLOGE("iccTransmitApduBasicChannelResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -5987,7 +5987,7 @@ int radio::iccOpenLogicalChannelResponse(int slotId,
                                          int responseType, int serial, RIL_Errno e, void *response,
                                          size_t responseLen) {
 #if VDBG
-    RLOGD("iccOpenLogicalChannelResponse: serial %d", serial);
+    RLOGE("iccOpenLogicalChannelResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6025,7 +6025,7 @@ int radio::iccCloseLogicalChannelResponse(int slotId,
                                           int responseType, int serial, RIL_Errno e,
                                           void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("iccCloseLogicalChannelResponse: serial %d", serial);
+    RLOGE("iccCloseLogicalChannelResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6047,7 +6047,7 @@ int radio::iccTransmitApduLogicalChannelResponse(int slotId,
                                                  int responseType, int serial, RIL_Errno e,
                                                  void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("iccTransmitApduLogicalChannelResponse: serial %d", serial);
+    RLOGE("iccTransmitApduLogicalChannelResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6071,7 +6071,7 @@ int radio::nvReadItemResponse(int slotId,
                               int responseType, int serial, RIL_Errno e,
                               void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("nvReadItemResponse: serial %d", serial);
+    RLOGE("nvReadItemResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6092,7 +6092,7 @@ int radio::nvWriteItemResponse(int slotId,
                                int responseType, int serial, RIL_Errno e,
                                void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("nvWriteItemResponse: serial %d", serial);
+    RLOGE("nvWriteItemResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6112,7 +6112,7 @@ int radio::nvWriteCdmaPrlResponse(int slotId,
                                   int responseType, int serial, RIL_Errno e,
                                   void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("nvWriteCdmaPrlResponse: serial %d", serial);
+    RLOGE("nvWriteCdmaPrlResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6132,7 +6132,7 @@ int radio::nvResetConfigResponse(int slotId,
                                  int responseType, int serial, RIL_Errno e,
                                  void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("nvResetConfigResponse: serial %d", serial);
+    RLOGE("nvResetConfigResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6152,7 +6152,7 @@ int radio::setUiccSubscriptionResponse(int slotId,
                                        int responseType, int serial, RIL_Errno e,
                                        void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setUiccSubscriptionResponse: serial %d", serial);
+    RLOGE("setUiccSubscriptionResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6173,7 +6173,7 @@ int radio::setDataAllowedResponse(int slotId,
                                   int responseType, int serial, RIL_Errno e,
                                   void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setDataAllowedResponse: serial %d", serial);
+    RLOGE("setDataAllowedResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6193,7 +6193,7 @@ int radio::getHardwareConfigResponse(int slotId,
                                      int responseType, int serial, RIL_Errno e,
                                      void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getHardwareConfigResponse: serial %d", serial);
+    RLOGE("getHardwareConfigResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6223,7 +6223,7 @@ int radio::requestIccSimAuthenticationResponse(int slotId,
                                                int responseType, int serial, RIL_Errno e,
                                                void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("requestIccSimAuthenticationResponse: serial %d", serial);
+    RLOGE("requestIccSimAuthenticationResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6247,7 +6247,7 @@ int radio::setDataProfileResponse(int slotId,
                                   int responseType, int serial, RIL_Errno e,
                                   void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setDataProfileResponse: serial %d", serial);
+    RLOGE("setDataProfileResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6267,7 +6267,7 @@ int radio::requestShutdownResponse(int slotId,
                                   int responseType, int serial, RIL_Errno e,
                                   void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("requestShutdownResponse: serial %d", serial);
+    RLOGE("requestShutdownResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6300,7 +6300,7 @@ int radio::getRadioCapabilityResponse(int slotId,
                                      int responseType, int serial, RIL_Errno e,
                                      void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getRadioCapabilityResponse: serial %d", serial);
+    RLOGE("getRadioCapabilityResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6322,7 +6322,7 @@ int radio::setRadioCapabilityResponse(int slotId,
                                      int responseType, int serial, RIL_Errno e,
                                      void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setRadioCapabilityResponse: serial %d", serial);
+    RLOGE("setRadioCapabilityResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6360,7 +6360,7 @@ int radio::startLceServiceResponse(int slotId,
                                    int responseType, int serial, RIL_Errno e,
                                    void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("startLceServiceResponse: serial %d", serial);
+    RLOGE("startLceServiceResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6383,7 +6383,7 @@ int radio::stopLceServiceResponse(int slotId,
                                   int responseType, int serial, RIL_Errno e,
                                   void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("stopLceServiceResponse: serial %d", serial);
+    RLOGE("stopLceServiceResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6406,7 +6406,7 @@ int radio::pullLceDataResponse(int slotId,
                                int responseType, int serial, RIL_Errno e,
                                void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("pullLceDataResponse: serial %d", serial);
+    RLOGE("pullLceDataResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6435,7 +6435,7 @@ int radio::getModemActivityInfoResponse(int slotId,
                                         int responseType, int serial, RIL_Errno e,
                                         void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getModemActivityInfoResponse: serial %d", serial);
+    RLOGE("getModemActivityInfoResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6471,7 +6471,7 @@ int radio::setAllowedCarriersResponse(int slotId,
                                       int responseType, int serial, RIL_Errno e,
                                       void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setAllowedCarriersResponse: serial %d", serial);
+    RLOGE("setAllowedCarriersResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6493,7 +6493,7 @@ int radio::getAllowedCarriersResponse(int slotId,
                                       int responseType, int serial, RIL_Errno e,
                                       void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("getAllowedCarriersResponse: serial %d", serial);
+    RLOGE("getAllowedCarriersResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6503,7 +6503,7 @@ int radio::getAllowedCarriersResponse(int slotId,
         bool allAllowed = true;
         if (response == NULL) {
 #if VDBG
-            RLOGD("getAllowedCarriersResponse response is NULL: all allowed");
+            RLOGE("getAllowedCarriersResponse response is NULL: all allowed");
 #endif
             carrierInfo.allowedCarriers.resize(0);
             carrierInfo.excludedCarriers.resize(0);
@@ -6553,7 +6553,7 @@ int radio::sendDeviceStateResponse(int slotId,
                               int responseType, int serial, RIL_Errno e,
                               void *response, size_t responselen) {
 #if VDBG
-    RLOGD("sendDeviceStateResponse: serial %d", serial);
+    RLOGE("sendDeviceStateResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6572,7 +6572,7 @@ int radio::sendDeviceStateResponse(int slotId,
 int radio::setCarrierInfoForImsiEncryptionResponse(int slotId,
                                int responseType, int serial, RIL_Errno e,
                                void *response, size_t responseLen) {
-    RLOGD("setCarrierInfoForImsiEncryptionResponse: serial %d", serial);
+    RLOGE("setCarrierInfoForImsiEncryptionResponse: serial %d", serial);
     if (radioService[slotId]->mRadioResponseV1_1 != NULL) {
         RadioResponseInfo responseInfo = {};
         populateResponseInfo(responseInfo, serial, responseType, e);
@@ -6590,7 +6590,7 @@ int radio::setIndicationFilterResponse(int slotId,
                               int responseType, int serial, RIL_Errno e,
                               void *response, size_t responselen) {
 #if VDBG
-    RLOGD("setIndicationFilterResponse: serial %d", serial);
+    RLOGE("setIndicationFilterResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL) {
@@ -6611,7 +6611,7 @@ int radio::setSimCardPowerResponse(int slotId,
                                    int responseType, int serial, RIL_Errno e,
                                    void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("setSimCardPowerResponse: serial %d", serial);
+    RLOGE("setSimCardPowerResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponse != NULL
@@ -6623,7 +6623,7 @@ int radio::setSimCardPowerResponse(int slotId,
                     setSimCardPowerResponse_1_1(responseInfo);
             radioService[slotId]->checkReturnStatus(retStatus);
         } else {
-            RLOGD("setSimCardPowerResponse: radioService[%d]->mRadioResponseV1_1 == NULL",
+            RLOGE("setSimCardPowerResponse: radioService[%d]->mRadioResponseV1_1 == NULL",
                     slotId);
             Return<void> retStatus
                     = radioService[slotId]->mRadioResponse->setSimCardPowerResponse(responseInfo);
@@ -6639,7 +6639,7 @@ int radio::setSimCardPowerResponse(int slotId,
 int radio::startNetworkScanResponse(int slotId, int responseType, int serial, RIL_Errno e,
                                     void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("startNetworkScanResponse: serial %d", serial);
+    RLOGE("startNetworkScanResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponseV1_1 != NULL) {
@@ -6658,7 +6658,7 @@ int radio::startNetworkScanResponse(int slotId, int responseType, int serial, RI
 int radio::stopNetworkScanResponse(int slotId, int responseType, int serial, RIL_Errno e,
                                    void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("stopNetworkScanResponse: serial %d", serial);
+    RLOGE("stopNetworkScanResponse: serial %d", serial);
 #endif
 
     if (radioService[slotId]->mRadioResponseV1_1 != NULL) {
@@ -6683,7 +6683,7 @@ void convertRilKeepaliveStatusToHal(const RIL_KeepaliveStatus *rilStatus,
 int radio::startKeepaliveResponse(int slotId, int responseType, int serial, RIL_Errno e,
                                     void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("%s(): %d", __FUNCTION__, serial);
+    RLOGE("%s(): %d", __FUNCTION__, serial);
 #endif
     RadioResponseInfo responseInfo = {};
     populateResponseInfo(responseInfo, serial, responseType, e);
@@ -6711,7 +6711,7 @@ int radio::startKeepaliveResponse(int slotId, int responseType, int serial, RIL_
 int radio::stopKeepaliveResponse(int slotId, int responseType, int serial, RIL_Errno e,
                                     void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("%s(): %d", __FUNCTION__, serial);
+    RLOGE("%s(): %d", __FUNCTION__, serial);
 #endif
     RadioResponseInfo responseInfo = {};
     populateResponseInfo(responseInfo, serial, responseType, e);
@@ -6732,7 +6732,7 @@ int radio::sendRequestRawResponse(int slotId,
                                   int responseType, int serial, RIL_Errno e,
                                   void *response, size_t responseLen) {
 #if VDBG
-   RLOGD("sendRequestRawResponse: serial %d", serial);
+   RLOGE("sendRequestRawResponse: serial %d", serial);
 #endif
 
     if (oemHookService[slotId]->mOemHookResponse != NULL) {
@@ -6761,7 +6761,7 @@ int radio::sendRequestStringsResponse(int slotId,
                                       int responseType, int serial, RIL_Errno e,
                                       void *response, size_t responseLen) {
 #if VDBG
-    RLOGD("sendRequestStringsResponse: serial %d", serial);
+    RLOGE("sendRequestStringsResponse: serial %d", serial);
 #endif
 
     if (oemHookService[slotId]->mOemHookResponse != NULL) {
@@ -6809,7 +6809,7 @@ int radio::radioStateChangedInd(int slotId,
     if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
         RadioState radioState =
                 (RadioState) CALL_ONSTATEREQUEST(slotId);
-        RLOGD("radioStateChangedInd: radioState %d", radioState);
+        RLOGE("radioStateChangedInd: radioState %d", radioState);
         Return<void> retStatus = radioService[slotId]->mRadioIndication->radioStateChanged(
                 convertIntToRadioIndicationType(indicationType), radioState);
         radioService[slotId]->checkReturnStatus(retStatus);
@@ -6825,7 +6825,7 @@ int radio::callStateChangedInd(int slotId,
                                size_t responseLen) {
     if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
 #if VDBG
-        RLOGD("callStateChangedInd");
+        RLOGE("callStateChangedInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->callStateChanged(
                 convertIntToRadioIndicationType(indicationType));
@@ -6842,7 +6842,7 @@ int radio::networkStateChangedInd(int slotId,
                                   size_t responseLen) {
     if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
 #if VDBG
-        RLOGD("networkStateChangedInd");
+        RLOGE("networkStateChangedInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->networkStateChanged(
                 convertIntToRadioIndicationType(indicationType));
@@ -6908,7 +6908,7 @@ int radio::newSmsInd(int slotId, int indicationType,
         hidl_vec<uint8_t> pdu;
         pdu.setToExternal(bytes, responseLen/2);
 #if VDBG
-        RLOGD("newSmsInd");
+        RLOGE("newSmsInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->newSms(
                 convertIntToRadioIndicationType(indicationType), pdu);
@@ -6939,7 +6939,7 @@ int radio::newSmsStatusReportInd(int slotId,
         hidl_vec<uint8_t> pdu;
         pdu.setToExternal(bytes, responseLen/2);
 #if VDBG
-        RLOGD("newSmsStatusReportInd");
+        RLOGE("newSmsStatusReportInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->newSmsStatusReport(
                 convertIntToRadioIndicationType(indicationType), pdu);
@@ -6961,7 +6961,7 @@ int radio::newSmsOnSimInd(int slotId, int indicationType,
         }
         int32_t recordNumber = ((int32_t *) response)[0];
 #if VDBG
-        RLOGD("newSmsOnSimInd: slotIndex %d", recordNumber);
+        RLOGE("newSmsOnSimInd: slotIndex %d", recordNumber);
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->newSmsOnSim(
                 convertIntToRadioIndicationType(indicationType), recordNumber);
@@ -6985,7 +6985,7 @@ int radio::onUssdInd(int slotId, int indicationType,
         hidl_string msg = convertCharPtrToHidlString(strings[1]);
         UssdModeType modeType = (UssdModeType) atoi(mode);
 #if VDBG
-        RLOGD("onUssdInd: mode %s", mode);
+        RLOGE("onUssdInd: mode %s", mode);
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->onUssd(
                 convertIntToRadioIndicationType(indicationType), modeType, msg);
@@ -7025,7 +7025,7 @@ int radio::nitzTimeReceivedInd(int slotId,
         nitzTime = convertCharPtrToHidlString(resp);
         memsetAndFreeStrings(1, resp);
 #if VDBG
-        RLOGD("nitzTimeReceivedInd: nitzTime %s receivedTime %" PRId64, nitzTime.c_str(),
+        RLOGE("nitzTimeReceivedInd: nitzTime %s receivedTime %" PRId64, nitzTime.c_str(),
                 timeReceived);
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->nitzTimeReceived(
@@ -7148,7 +7148,7 @@ int radio::currentSignalStrengthInd(int slotId,
         convertRilSignalStrengthToHal(response, responseLen, signalStrength);
 
 #if VDBG
-        RLOGD("currentSignalStrengthInd");
+        RLOGE("currentSignalStrengthInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->currentSignalStrength(
                 convertIntToRadioIndicationType(indicationType), signalStrength);
@@ -7248,7 +7248,7 @@ int radio::dataCallListChangedInd(int slotId,
         hidl_vec<SetupDataCallResult> dcList;
         convertRilDataCallListToHal(response, responseLen, dcList);
 #if VDBG
-        RLOGD("dataCallListChangedInd");
+        RLOGE("dataCallListChangedInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->dataCallListChanged(
                 convertIntToRadioIndicationType(indicationType), dcList);
@@ -7277,7 +7277,7 @@ int radio::suppSvcNotifyInd(int slotId, int indicationType,
         suppSvc.number = convertCharPtrToHidlString(ssn->number);
 
 #if VDBG
-        RLOGD("suppSvcNotifyInd: isMT %d code %d index %d type %d",
+        RLOGE("suppSvcNotifyInd: isMT %d code %d index %d type %d",
                 suppSvc.isMT, suppSvc.code, suppSvc.index, suppSvc.type);
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->suppSvcNotify(
@@ -7294,7 +7294,7 @@ int radio::stkSessionEndInd(int slotId, int indicationType,
                             int token, RIL_Errno e, void *response, size_t responseLen) {
     if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
 #if VDBG
-        RLOGD("stkSessionEndInd");
+        RLOGE("stkSessionEndInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->stkSessionEnd(
                 convertIntToRadioIndicationType(indicationType));
@@ -7315,7 +7315,7 @@ int radio::stkProactiveCommandInd(int slotId,
             return 0;
         }
 #if VDBG
-        RLOGD("stkProactiveCommandInd");
+        RLOGE("stkProactiveCommandInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->stkProactiveCommand(
                 convertIntToRadioIndicationType(indicationType),
@@ -7336,7 +7336,7 @@ int radio::stkEventNotifyInd(int slotId, int indicationType,
             return 0;
         }
 #if VDBG
-        RLOGD("stkEventNotifyInd");
+        RLOGE("stkEventNotifyInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->stkEventNotify(
                 convertIntToRadioIndicationType(indicationType),
@@ -7358,7 +7358,7 @@ int radio::stkCallSetupInd(int slotId, int indicationType,
         }
         int32_t timeout = ((int32_t *) response)[0];
 #if VDBG
-        RLOGD("stkCallSetupInd: timeout %d", timeout);
+        RLOGE("stkCallSetupInd: timeout %d", timeout);
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->stkCallSetup(
                 convertIntToRadioIndicationType(indicationType), timeout);
@@ -7375,7 +7375,7 @@ int radio::simSmsStorageFullInd(int slotId,
                                 size_t responseLen) {
     if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
 #if VDBG
-        RLOGD("simSmsStorageFullInd");
+        RLOGE("simSmsStorageFullInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->simSmsStorageFull(
                 convertIntToRadioIndicationType(indicationType));
@@ -7403,7 +7403,7 @@ int radio::simRefreshInd(int slotId, int indicationType,
         refreshResult.aid = convertCharPtrToHidlString(simRefreshResponse->aid);
 
 #if VDBG
-        RLOGD("simRefreshInd: type %d efId %d", refreshResult.type, refreshResult.efId);
+        RLOGE("simRefreshInd: type %d efId %d", refreshResult.type, refreshResult.efId);
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->simRefresh(
                 convertIntToRadioIndicationType(indicationType), refreshResult);
@@ -7440,7 +7440,7 @@ int radio::callRingInd(int slotId, int indicationType,
         }
 
 #if VDBG
-        RLOGD("callRingInd: isGsm %d", isGsm);
+        RLOGE("callRingInd: isGsm %d", isGsm);
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->callRing(
                 convertIntToRadioIndicationType(indicationType), isGsm, record);
@@ -7457,7 +7457,7 @@ int radio::simStatusChangedInd(int slotId,
                                size_t responseLen) {
     if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
 #if VDBG
-        RLOGD("simStatusChangedInd");
+        RLOGE("simStatusChangedInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->simStatusChanged(
                 convertIntToRadioIndicationType(indicationType));
@@ -7505,7 +7505,7 @@ int radio::cdmaNewSmsInd(int slotId, int indicationType,
         msg.bearerData.setToExternal(rilMsg->aBearerData, digitLimit);
 
 #if VDBG
-        RLOGD("cdmaNewSmsInd");
+        RLOGE("cdmaNewSmsInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->cdmaNewSms(
                 convertIntToRadioIndicationType(indicationType), msg);
@@ -7529,7 +7529,7 @@ int radio::newBroadcastSmsInd(int slotId,
         hidl_vec<uint8_t> data;
         data.setToExternal((uint8_t *) response, responseLen);
 #if VDBG
-        RLOGD("newBroadcastSmsInd");
+        RLOGE("newBroadcastSmsInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->newBroadcastSms(
                 convertIntToRadioIndicationType(indicationType), data);
@@ -7546,7 +7546,7 @@ int radio::cdmaRuimSmsStorageFullInd(int slotId,
                                      size_t responseLen) {
     if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
 #if VDBG
-        RLOGD("cdmaRuimSmsStorageFullInd");
+        RLOGE("cdmaRuimSmsStorageFullInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->cdmaRuimSmsStorageFull(
                 convertIntToRadioIndicationType(indicationType));
@@ -7569,7 +7569,7 @@ int radio::restrictedStateChangedInd(int slotId,
         }
         int32_t state = ((int32_t *) response)[0];
 #if VDBG
-        RLOGD("restrictedStateChangedInd: state %d", state);
+        RLOGE("restrictedStateChangedInd: state %d", state);
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->restrictedStateChanged(
                 convertIntToRadioIndicationType(indicationType), (PhoneRestrictedState) state);
@@ -7587,7 +7587,7 @@ int radio::enterEmergencyCallbackModeInd(int slotId,
                                          size_t responseLen) {
     if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
 #if VDBG
-        RLOGD("enterEmergencyCallbackModeInd");
+        RLOGE("enterEmergencyCallbackModeInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->enterEmergencyCallbackMode(
                 convertIntToRadioIndicationType(indicationType));
@@ -7621,7 +7621,7 @@ int radio::cdmaCallWaitingInd(int slotId,
         callWaitingRecord.numberPlan = (CdmaCallWaitingNumberPlan) callWaitingRil->number_plan;
 
 #if VDBG
-        RLOGD("cdmaCallWaitingInd");
+        RLOGE("cdmaCallWaitingInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->cdmaCallWaiting(
                 convertIntToRadioIndicationType(indicationType), callWaitingRecord);
@@ -7643,7 +7643,7 @@ int radio::cdmaOtaProvisionStatusInd(int slotId,
         }
         int32_t status = ((int32_t *) response)[0];
 #if VDBG
-        RLOGD("cdmaOtaProvisionStatusInd: status %d", status);
+        RLOGE("cdmaOtaProvisionStatusInd: status %d", status);
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->cdmaOtaProvisionStatus(
                 convertIntToRadioIndicationType(indicationType), (CdmaOtaProvisionStatus) status);
@@ -7834,7 +7834,7 @@ int radio::cdmaInfoRecInd(int slotId,
         }
 
 #if VDBG
-        RLOGD("cdmaInfoRecInd");
+        RLOGE("cdmaInfoRecInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->cdmaInfoRec(
                 convertIntToRadioIndicationType(indicationType), records);
@@ -7856,7 +7856,7 @@ int radio::indicateRingbackToneInd(int slotId,
         }
         bool start = ((int32_t *) response)[0];
 #if VDBG
-        RLOGD("indicateRingbackToneInd: start %d", start);
+        RLOGE("indicateRingbackToneInd: start %d", start);
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->indicateRingbackTone(
                 convertIntToRadioIndicationType(indicationType), start);
@@ -7873,7 +7873,7 @@ int radio::resendIncallMuteInd(int slotId,
                                size_t responseLen) {
     if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
 #if VDBG
-        RLOGD("resendIncallMuteInd");
+        RLOGE("resendIncallMuteInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->resendIncallMute(
                 convertIntToRadioIndicationType(indicationType));
@@ -7895,7 +7895,7 @@ int radio::cdmaSubscriptionSourceChangedInd(int slotId,
         }
         int32_t cdmaSource = ((int32_t *) response)[0];
 #if VDBG
-        RLOGD("cdmaSubscriptionSourceChangedInd: cdmaSource %d", cdmaSource);
+        RLOGE("cdmaSubscriptionSourceChangedInd: cdmaSource %d", cdmaSource);
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->
                 cdmaSubscriptionSourceChanged(convertIntToRadioIndicationType(indicationType),
@@ -7919,7 +7919,7 @@ int radio::cdmaPrlChangedInd(int slotId,
         }
         int32_t version = ((int32_t *) response)[0];
 #if VDBG
-        RLOGD("cdmaPrlChangedInd: version %d", version);
+        RLOGE("cdmaPrlChangedInd: version %d", version);
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->cdmaPrlChanged(
                 convertIntToRadioIndicationType(indicationType), version);
@@ -7936,7 +7936,7 @@ int radio::exitEmergencyCallbackModeInd(int slotId,
                                         size_t responseLen) {
     if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
 #if VDBG
-        RLOGD("exitEmergencyCallbackModeInd");
+        RLOGE("exitEmergencyCallbackModeInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->exitEmergencyCallbackMode(
                 convertIntToRadioIndicationType(indicationType));
@@ -7953,7 +7953,7 @@ int radio::rilConnectedInd(int slotId,
                            int indicationType, int token, RIL_Errno e, void *response,
                            size_t responseLen) {
     if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
-        RLOGD("rilConnectedInd");
+        RLOGE("rilConnectedInd");
         Return<void> retStatus = radioService[slotId]->mRadioIndication->rilConnected(
                 convertIntToRadioIndicationType(indicationType));
         radioService[slotId]->checkReturnStatus(retStatus);
@@ -7974,7 +7974,7 @@ int radio::voiceRadioTechChangedInd(int slotId,
         }
         int32_t rat = ((int32_t *) response)[0];
 #if VDBG
-        RLOGD("voiceRadioTechChangedInd: rat %d", rat);
+        RLOGE("voiceRadioTechChangedInd: rat %d", rat);
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->voiceRadioTechChanged(
                 convertIntToRadioIndicationType(indicationType), (RadioTechnology) rat);
@@ -8145,7 +8145,7 @@ int radio::cellInfoListInd(int slotId,
         convertRilCellInfoListToHal(response, responseLen, records);
 
 #if VDBG
-        RLOGD("cellInfoListInd");
+        RLOGE("cellInfoListInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->cellInfoList(
                 convertIntToRadioIndicationType(indicationType), records);
@@ -8162,7 +8162,7 @@ int radio::imsNetworkStateChangedInd(int slotId,
                                      size_t responseLen) {
     if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
 #if VDBG
-        RLOGD("imsNetworkStateChangedInd");
+        RLOGE("imsNetworkStateChangedInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->imsNetworkStateChanged(
                 convertIntToRadioIndicationType(indicationType));
@@ -8185,7 +8185,7 @@ int radio::subscriptionStatusChangedInd(int slotId,
         }
         bool activate = ((int32_t *) response)[0];
 #if VDBG
-        RLOGD("subscriptionStatusChangedInd: activate %d", activate);
+        RLOGE("subscriptionStatusChangedInd: activate %d", activate);
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->subscriptionStatusChanged(
                 convertIntToRadioIndicationType(indicationType), activate);
@@ -8208,7 +8208,7 @@ int radio::srvccStateNotifyInd(int slotId,
         }
         int32_t state = ((int32_t *) response)[0];
 #if VDBG
-        RLOGD("srvccStateNotifyInd: rat %d", state);
+        RLOGE("srvccStateNotifyInd: rat %d", state);
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->srvccStateNotify(
                 convertIntToRadioIndicationType(indicationType), (SrvccState) state);
@@ -8267,7 +8267,7 @@ int radio::hardwareConfigChangedInd(int slotId,
         convertRilHardwareConfigListToHal(response, responseLen, configs);
 
 #if VDBG
-        RLOGD("hardwareConfigChangedInd");
+        RLOGE("hardwareConfigChangedInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->hardwareConfigChanged(
                 convertIntToRadioIndicationType(indicationType), configs);
@@ -8302,7 +8302,7 @@ int radio::radioCapabilityIndicationInd(int slotId,
         convertRilRadioCapabilityToHal(response, responseLen, rc);
 
 #if VDBG
-        RLOGD("radioCapabilityIndicationInd");
+        RLOGE("radioCapabilityIndicationInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->radioCapabilityIndication(
                 convertIntToRadioIndicationType(indicationType), rc);
@@ -8347,7 +8347,7 @@ int radio::onSupplementaryServiceIndicationInd(int slotId,
 
         if (isServiceTypeCfQuery(rilSsResponse->serviceType, rilSsResponse->requestType)) {
 #if VDBG
-            RLOGD("onSupplementaryServiceIndicationInd CF type, num of Cf elements %d",
+            RLOGE("onSupplementaryServiceIndicationInd CF type, num of Cf elements %d",
                     rilSsResponse->cfData.numValidIndexes);
 #endif
             if (rilSsResponse->cfData.numValidIndexes > NUM_SERVICE_CLASSES) {
@@ -8373,7 +8373,7 @@ int radio::onSupplementaryServiceIndicationInd(int slotId,
                  cfInfo->number = convertCharPtrToHidlString(cf.number);
                  cfInfo->timeSeconds = cf.timeSeconds;
 #if VDBG
-                 RLOGD("onSupplementaryServiceIndicationInd: "
+                 RLOGE("onSupplementaryServiceIndicationInd: "
                         "Data: %d,reason=%d,cls=%d,toa=%d,num=%s,tout=%d],", cf.status,
                         cf.reason, cf.serviceClass, cf.toa, (char*)cf.number, cf.timeSeconds);
 #endif
@@ -8386,7 +8386,7 @@ int radio::onSupplementaryServiceIndicationInd(int slotId,
             ss.ssInfo[0].ssInfo.resize(SS_INFO_MAX);
             for (int i = 0; i < SS_INFO_MAX; i++) {
 #if VDBG
-                 RLOGD("onSupplementaryServiceIndicationInd: Data: %d",
+                 RLOGE("onSupplementaryServiceIndicationInd: Data: %d",
                         rilSsResponse->ssInfo[i]);
 #endif
                  ss.ssInfo[0].ssInfo[i] = rilSsResponse->ssInfo[i];
@@ -8394,7 +8394,7 @@ int radio::onSupplementaryServiceIndicationInd(int slotId,
         }
 
 #if VDBG
-        RLOGD("onSupplementaryServiceIndicationInd");
+        RLOGE("onSupplementaryServiceIndicationInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->
                 onSupplementaryServiceIndication(convertIntToRadioIndicationType(indicationType),
@@ -8417,7 +8417,7 @@ int radio::stkCallControlAlphaNotifyInd(int slotId,
             return 0;
         }
 #if VDBG
-        RLOGD("stkCallControlAlphaNotifyInd");
+        RLOGE("stkCallControlAlphaNotifyInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->stkCallControlAlphaNotify(
                 convertIntToRadioIndicationType(indicationType),
@@ -8450,7 +8450,7 @@ int radio::lceDataInd(int slotId,
         LceDataInfo lce = {};
         convertRilLceDataInfoToHal(response, responseLen, lce);
 #if VDBG
-        RLOGD("lceDataInd");
+        RLOGE("lceDataInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->lceData(
                 convertIntToRadioIndicationType(indicationType), lce);
@@ -8479,7 +8479,7 @@ int radio::pcoDataInd(int slotId,
         pco.contents.setToExternal((uint8_t *) rilPcoData->contents, rilPcoData->contents_length);
 
 #if VDBG
-        RLOGD("pcoDataInd");
+        RLOGE("pcoDataInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->pcoData(
                 convertIntToRadioIndicationType(indicationType), pco);
@@ -8500,7 +8500,7 @@ int radio::modemResetInd(int slotId,
             return 0;
         }
 #if VDBG
-        RLOGD("modemResetInd");
+        RLOGE("modemResetInd");
 #endif
         Return<void> retStatus = radioService[slotId]->mRadioIndication->modemReset(
                 convertIntToRadioIndicationType(indicationType),
@@ -8517,17 +8517,17 @@ int radio::networkScanResultInd(int slotId,
                                 int indicationType, int token, RIL_Errno e, void *response,
                                 size_t responseLen) {
 #if VDBG
-    RLOGD("networkScanResultInd");
+    RLOGE("networkScanResultInd");
 #endif
     if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndicationV1_1 != NULL) {
         if (response == NULL || responseLen == 0) {
             RLOGE("networkScanResultInd: invalid response");
             return 0;
         }
-        RLOGD("networkScanResultInd");
+        RLOGE("networkScanResultInd");
 
 #if VDBG
-        RLOGD("networkScanResultInd");
+        RLOGE("networkScanResultInd");
 #endif
 
         RIL_NetworkScanResult *networkScanResult = (RIL_NetworkScanResult *) response;
@@ -8557,7 +8557,7 @@ int radio::carrierInfoForImsiEncryption(int slotId,
             RLOGE("carrierInfoForImsiEncryption: invalid response");
             return 0;
         }
-        RLOGD("carrierInfoForImsiEncryption");
+        RLOGE("carrierInfoForImsiEncryption");
         Return<void> retStatus = radioService[slotId]->mRadioIndicationV1_1->
                 carrierInfoForImsiEncryption(convertIntToRadioIndicationType(indicationType));
         radioService[slotId]->checkReturnStatus(retStatus);
@@ -8573,7 +8573,7 @@ int radio::keepaliveStatusInd(int slotId,
                          int indicationType, int token, RIL_Errno e, void *response,
                          size_t responseLen) {
 #if VDBG
-    RLOGD("%s(): token=%d", __FUNCTION__, token);
+    RLOGE("%s(): token=%d", __FUNCTION__, token);
 #endif
     if (radioService[slotId] == NULL || radioService[slotId]->mRadioIndication == NULL) {
         RLOGE("%s: radioService[%d]->mRadioIndication == NULL", __FUNCTION__, slotId);
@@ -8614,7 +8614,7 @@ int radio::oemHookRawInd(int slotId,
         hidl_vec<uint8_t> data;
         data.setToExternal((uint8_t *) response, responseLen);
 #if VDBG
-        RLOGD("oemHookRawInd");
+        RLOGE("oemHookRawInd");
 #endif
         Return<void> retStatus = oemHookService[slotId]->mOemHookIndication->oemHookRaw(
                 convertIntToRadioIndicationType(indicationType), data);
@@ -8656,7 +8656,7 @@ void radio::registerService(RIL_RadioFunctions *callbacks, CommandInfo *commands
         radioService[i]->mSlotId = i;
         oemHookService[i] = new OemHookImpl;
         oemHookService[i]->mSlotId = i;
-        RLOGD("registerService: starting android::hardware::radio::V1_1::IRadio %s",
+        RLOGE("registerService: starting android::hardware::radio::V1_1::IRadio %s",
                 serviceNames[i]);
         android::status_t status = radioService[i]->registerAsService(serviceNames[i]);
         status = oemHookService[i]->registerAsService(serviceNames[i]);
diff --git a/ril/libril/sap_service.cpp b/ril/libril/sap_service.cpp
index 52ebd6c..d2dce73 100644
--- a/ril/libril/sap_service.cpp
+++ b/ril/libril/sap_service.cpp
@@ -86,7 +86,7 @@ void SapImpl::checkReturnStatus(Return<void>& ret) {
 }
 
 Return<void> SapImpl::setCallback(const ::android::sp<ISapCallback>& sapCallbackParam) {
-    RLOGD("SapImpl::setCallback for slotId %d", slotId);
+    RLOGE("SapImpl::setCallback for slotId %d", slotId);
     sapCallback = sapCallbackParam;
     return Void();
 }
@@ -117,7 +117,7 @@ Return<void> SapImpl::addPayloadAndDispatchRequest(MsgHeader *msg, uint16_t reqL
 
     RilSapSocket *sapSocket = RilSapSocket::getSocketById(rilSocketId);
     if (sapSocket) {
-        RLOGD("SapImpl::addPayloadAndDispatchRequest: calling dispatchRequest");
+        RLOGE("SapImpl::addPayloadAndDispatchRequest: calling dispatchRequest");
         sapSocket->dispatchRequest(msg);
     } else {
         RLOGE("SapImpl::addPayloadAndDispatchRequest: sapSocket is null");
@@ -184,7 +184,7 @@ void SapImpl::sendFailedResponse(MsgId msgId, int32_t token, int numPointers, ..
 }
 
 Return<void> SapImpl::connectReq(int32_t token, int32_t maxMsgSize) {
-    RLOGD("SapImpl::connectReq");
+    RLOGE("SapImpl::connectReq");
     MsgHeader *msg = createMsgHeader(MsgId_RIL_SIM_SAP_CONNECT, token);
     if (msg == NULL) {
         RLOGE("SapImpl::connectReq: Error allocating memory for msg");
@@ -212,7 +212,7 @@ Return<void> SapImpl::connectReq(int32_t token, int32_t maxMsgSize) {
     }
     pb_ostream_t stream = pb_ostream_from_buffer(buffer, encodedSize);
 
-    RLOGD("SapImpl::connectReq calling pb_encode");
+    RLOGE("SapImpl::connectReq calling pb_encode");
     if (!pb_encode(&stream, RIL_SIM_SAP_CONNECT_REQ_fields, &req)) {
         RLOGE("SapImpl::connectReq: Error encoding RIL_SIM_SAP_CONNECT_REQ");
         sendFailedResponse(MsgId_RIL_SIM_SAP_CONNECT, token, 2, buffer, msg);
@@ -225,7 +225,7 @@ Return<void> SapImpl::connectReq(int32_t token, int32_t maxMsgSize) {
 }
 
 Return<void> SapImpl::disconnectReq(int32_t token) {
-    RLOGD("SapImpl::disconnectReq");
+    RLOGE("SapImpl::disconnectReq");
     MsgHeader *msg = createMsgHeader(MsgId_RIL_SIM_SAP_DISCONNECT, token);
     if (msg == NULL) {
         RLOGE("SapImpl::disconnectReq: Error allocating memory for msg");
@@ -253,7 +253,7 @@ Return<void> SapImpl::disconnectReq(int32_t token) {
 
     pb_ostream_t stream = pb_ostream_from_buffer(buffer, encodedSize);
 
-    RLOGD("SapImpl::disconnectReq calling pb_encode");
+    RLOGE("SapImpl::disconnectReq calling pb_encode");
     if (!pb_encode(&stream, RIL_SIM_SAP_DISCONNECT_REQ_fields, &req)) {
         RLOGE("SapImpl::disconnectReq: Error encoding RIL_SIM_SAP_DISCONNECT_REQ");
         sendFailedResponse(MsgId_RIL_SIM_SAP_DISCONNECT, token, 2, buffer, msg);
@@ -266,7 +266,7 @@ Return<void> SapImpl::disconnectReq(int32_t token) {
 }
 
 Return<void> SapImpl::apduReq(int32_t token, SapApduType type, const hidl_vec<uint8_t>& command) {
-    RLOGD("SapImpl::apduReq");
+    RLOGE("SapImpl::apduReq");
     MsgHeader *msg = createMsgHeader(MsgId_RIL_SIM_SAP_APDU, token);
     if (msg == NULL) {
         RLOGE("SapImpl::apduReq: Error allocating memory for msg");
@@ -306,7 +306,7 @@ Return<void> SapImpl::apduReq(int32_t token, SapApduType type, const hidl_vec<ui
 
     pb_ostream_t stream = pb_ostream_from_buffer(buffer, encodedSize);
 
-    RLOGD("SapImpl::apduReq calling pb_encode");
+    RLOGE("SapImpl::apduReq calling pb_encode");
     if (!pb_encode(&stream, RIL_SIM_SAP_APDU_REQ_fields, &req)) {
         RLOGE("SapImpl::apduReq: Error encoding RIL_SIM_SAP_APDU_REQ");
         sendFailedResponse(MsgId_RIL_SIM_SAP_APDU, token, 3, req.command, buffer, msg);
@@ -319,7 +319,7 @@ Return<void> SapImpl::apduReq(int32_t token, SapApduType type, const hidl_vec<ui
 }
 
 Return<void> SapImpl::transferAtrReq(int32_t token) {
-    RLOGD("SapImpl::transferAtrReq");
+    RLOGE("SapImpl::transferAtrReq");
     MsgHeader *msg = createMsgHeader(MsgId_RIL_SIM_SAP_TRANSFER_ATR, token);
     if (msg == NULL) {
         RLOGE("SapImpl::transferAtrReq: Error allocating memory for msg");
@@ -348,7 +348,7 @@ Return<void> SapImpl::transferAtrReq(int32_t token) {
 
     pb_ostream_t stream = pb_ostream_from_buffer(buffer, encodedSize);
 
-    RLOGD("SapImpl::transferAtrReq calling pb_encode");
+    RLOGE("SapImpl::transferAtrReq calling pb_encode");
     if (!pb_encode(&stream, RIL_SIM_SAP_TRANSFER_ATR_REQ_fields, &req)) {
         RLOGE("SapImpl::transferAtrReq: Error encoding RIL_SIM_SAP_TRANSFER_ATR_REQ");
         sendFailedResponse(MsgId_RIL_SIM_SAP_TRANSFER_ATR, token, 2, buffer, msg);
@@ -361,7 +361,7 @@ Return<void> SapImpl::transferAtrReq(int32_t token) {
 }
 
 Return<void> SapImpl::powerReq(int32_t token, bool state) {
-    RLOGD("SapImpl::powerReq");
+    RLOGE("SapImpl::powerReq");
     MsgHeader *msg = createMsgHeader(MsgId_RIL_SIM_SAP_POWER, token);
     if (msg == NULL) {
         RLOGE("SapImpl::powerReq: Error allocating memory for msg");
@@ -390,7 +390,7 @@ Return<void> SapImpl::powerReq(int32_t token, bool state) {
 
     pb_ostream_t stream = pb_ostream_from_buffer(buffer, encodedSize);
 
-    RLOGD("SapImpl::powerReq calling pb_encode");
+    RLOGE("SapImpl::powerReq calling pb_encode");
     if (!pb_encode(&stream, RIL_SIM_SAP_POWER_REQ_fields, &req)) {
         RLOGE("SapImpl::powerReq: Error encoding RIL_SIM_SAP_POWER_REQ");
         sendFailedResponse(MsgId_RIL_SIM_SAP_POWER, token, 2, buffer, msg);
@@ -403,7 +403,7 @@ Return<void> SapImpl::powerReq(int32_t token, bool state) {
 }
 
 Return<void> SapImpl::resetSimReq(int32_t token) {
-    RLOGD("SapImpl::resetSimReq");
+    RLOGE("SapImpl::resetSimReq");
     MsgHeader *msg = createMsgHeader(MsgId_RIL_SIM_SAP_RESET_SIM, token);
     if (msg == NULL) {
         RLOGE("SapImpl::resetSimReq: Error allocating memory for msg");
@@ -431,7 +431,7 @@ Return<void> SapImpl::resetSimReq(int32_t token) {
 
     pb_ostream_t stream = pb_ostream_from_buffer(buffer, encodedSize);
 
-    RLOGD("SapImpl::resetSimReq calling pb_encode");
+    RLOGE("SapImpl::resetSimReq calling pb_encode");
     if (!pb_encode(&stream, RIL_SIM_SAP_RESET_SIM_REQ_fields, &req)) {
         RLOGE("SapImpl::resetSimReq: Error encoding RIL_SIM_SAP_RESET_SIM_REQ");
         sendFailedResponse(MsgId_RIL_SIM_SAP_RESET_SIM, token, 2, buffer, msg);
@@ -444,7 +444,7 @@ Return<void> SapImpl::resetSimReq(int32_t token) {
 }
 
 Return<void> SapImpl::transferCardReaderStatusReq(int32_t token) {
-    RLOGD("SapImpl::transferCardReaderStatusReq");
+    RLOGE("SapImpl::transferCardReaderStatusReq");
     MsgHeader *msg = createMsgHeader(MsgId_RIL_SIM_SAP_TRANSFER_CARD_READER_STATUS, token);
     if (msg == NULL) {
         RLOGE("SapImpl::transferCardReaderStatusReq: Error allocating memory for msg");
@@ -474,7 +474,7 @@ Return<void> SapImpl::transferCardReaderStatusReq(int32_t token) {
 
     pb_ostream_t stream = pb_ostream_from_buffer(buffer, encodedSize);
 
-    RLOGD("SapImpl::transferCardReaderStatusReq calling pb_encode");
+    RLOGE("SapImpl::transferCardReaderStatusReq calling pb_encode");
     if (!pb_encode(&stream, RIL_SIM_SAP_TRANSFER_CARD_READER_STATUS_REQ_fields, &req)) {
         RLOGE("SapImpl::transferCardReaderStatusReq: Error encoding "
                 "RIL_SIM_SAP_TRANSFER_CARD_READER_STATUS_REQ");
@@ -488,7 +488,7 @@ Return<void> SapImpl::transferCardReaderStatusReq(int32_t token) {
 }
 
 Return<void> SapImpl::setTransferProtocolReq(int32_t token, SapTransferProtocol transferProtocol) {
-    RLOGD("SapImpl::setTransferProtocolReq");
+    RLOGE("SapImpl::setTransferProtocolReq");
     MsgHeader *msg = createMsgHeader(MsgId_RIL_SIM_SAP_SET_TRANSFER_PROTOCOL, token);
     if (msg == NULL) {
         RLOGE("SapImpl::setTransferProtocolReq: Error allocating memory for msg");
@@ -518,7 +518,7 @@ Return<void> SapImpl::setTransferProtocolReq(int32_t token, SapTransferProtocol
 
     pb_ostream_t stream = pb_ostream_from_buffer(buffer, encodedSize);
 
-    RLOGD("SapImpl::setTransferProtocolReq calling pb_encode");
+    RLOGE("SapImpl::setTransferProtocolReq calling pb_encode");
     if (!pb_encode(&stream, RIL_SIM_SAP_SET_TRANSFER_PROTOCOL_REQ_fields, &req)) {
         RLOGE("SapImpl::setTransferProtocolReq: Error encoding "
                 "RIL_SIM_SAP_SET_TRANSFER_PROTOCOL_REQ");
@@ -662,7 +662,7 @@ void *sapDecodeMessage(MsgId msgId, MsgType msgType, uint8_t *payloadPtr, size_t
 sp<SapImpl> getSapImpl(RilSapSocket *sapSocket) {
     switch (sapSocket->getSocketId()) {
         case RIL_SOCKET_1:
-            RLOGD("getSapImpl: returning sapService[0]");
+            RLOGE("getSapImpl: returning sapService[0]");
             return sapService[0];
         #if (SIM_COUNT >= 2)
         case RIL_SOCKET_2:
@@ -783,14 +783,14 @@ void processResponse(MsgHeader *rsp, RilSapSocket *sapSocket, MsgType msgType) {
         return;
     }
 
-    RLOGD("processResponse: sapCallback != NULL; msgId = %d; msgType = %d",
+    RLOGE("processResponse: sapCallback != NULL; msgId = %d; msgType = %d",
             msgId, msgType);
 
     Return<void> retStatus;
     switch (msgId) {
         case MsgId_RIL_SIM_SAP_CONNECT: {
             RIL_SIM_SAP_CONNECT_RSP *connectRsp = (RIL_SIM_SAP_CONNECT_RSP *)messagePtr;
-            RLOGD("processResponse: calling sapCallback->connectResponse %d %d %d",
+            RLOGE("processResponse: calling sapCallback->connectResponse %d %d %d",
                     rsp->token,
                     connectRsp->response,
                     connectRsp->max_message_size);
@@ -802,12 +802,12 @@ void processResponse(MsgHeader *rsp, RilSapSocket *sapSocket, MsgType msgType) {
 
         case MsgId_RIL_SIM_SAP_DISCONNECT:
             if (msgType == MsgType_RESPONSE) {
-                RLOGD("processResponse: calling sapCallback->disconnectResponse %d", rsp->token);
+                RLOGE("processResponse: calling sapCallback->disconnectResponse %d", rsp->token);
                 retStatus = sapImpl->sapCallback->disconnectResponse(rsp->token);
             } else {
                 RIL_SIM_SAP_DISCONNECT_IND *disconnectInd =
                         (RIL_SIM_SAP_DISCONNECT_IND *)messagePtr;
-                RLOGD("processResponse: calling sapCallback->disconnectIndication %d %d",
+                RLOGE("processResponse: calling sapCallback->disconnectIndication %d %d",
                         rsp->token, disconnectInd->disconnectType);
                 retStatus = sapImpl->sapCallback->disconnectIndication(rsp->token,
                         (SapDisconnectType)disconnectInd->disconnectType);
@@ -817,7 +817,7 @@ void processResponse(MsgHeader *rsp, RilSapSocket *sapSocket, MsgType msgType) {
         case MsgId_RIL_SIM_SAP_APDU: {
             RIL_SIM_SAP_APDU_RSP *apduRsp = (RIL_SIM_SAP_APDU_RSP *)messagePtr;
             SapResultCode apduResponse = convertApduResponseProtoToHal(apduRsp->response);
-            RLOGD("processResponse: calling sapCallback->apduResponse %d %d",
+            RLOGE("processResponse: calling sapCallback->apduResponse %d %d",
                     rsp->token, apduResponse);
             hidl_vec<uint8_t> apduRspVec;
             if (apduRsp->apduResponse != NULL && apduRsp->apduResponse->size > 0) {
@@ -832,7 +832,7 @@ void processResponse(MsgHeader *rsp, RilSapSocket *sapSocket, MsgType msgType) {
                 (RIL_SIM_SAP_TRANSFER_ATR_RSP *)messagePtr;
             SapResultCode transferAtrResponse =
                 convertTransferAtrResponseProtoToHal(transferAtrRsp->response);
-            RLOGD("processResponse: calling sapCallback->transferAtrResponse %d %d",
+            RLOGE("processResponse: calling sapCallback->transferAtrResponse %d %d",
                     rsp->token, transferAtrResponse);
             hidl_vec<uint8_t> transferAtrRspVec;
             if (transferAtrRsp->atr != NULL && transferAtrRsp->atr->size > 0) {
@@ -847,7 +847,7 @@ void processResponse(MsgHeader *rsp, RilSapSocket *sapSocket, MsgType msgType) {
         case MsgId_RIL_SIM_SAP_POWER: {
             SapResultCode powerResponse = convertPowerResponseProtoToHal(
                     ((RIL_SIM_SAP_POWER_RSP *)messagePtr)->response);
-            RLOGD("processResponse: calling sapCallback->powerResponse %d %d",
+            RLOGE("processResponse: calling sapCallback->powerResponse %d %d",
                     rsp->token, powerResponse);
             retStatus = sapImpl->sapCallback->powerResponse(rsp->token, powerResponse);
             break;
@@ -856,7 +856,7 @@ void processResponse(MsgHeader *rsp, RilSapSocket *sapSocket, MsgType msgType) {
         case MsgId_RIL_SIM_SAP_RESET_SIM: {
             SapResultCode resetSimResponse = convertResetSimResponseProtoToHal(
                     ((RIL_SIM_SAP_RESET_SIM_RSP *)messagePtr)->response);
-            RLOGD("processResponse: calling sapCallback->resetSimResponse %d %d",
+            RLOGE("processResponse: calling sapCallback->resetSimResponse %d %d",
                     rsp->token, resetSimResponse);
             retStatus = sapImpl->sapCallback->resetSimResponse(rsp->token, resetSimResponse);
             break;
@@ -864,7 +864,7 @@ void processResponse(MsgHeader *rsp, RilSapSocket *sapSocket, MsgType msgType) {
 
         case MsgId_RIL_SIM_SAP_STATUS: {
             RIL_SIM_SAP_STATUS_IND *statusInd = (RIL_SIM_SAP_STATUS_IND *)messagePtr;
-            RLOGD("processResponse: calling sapCallback->statusIndication %d %d",
+            RLOGE("processResponse: calling sapCallback->statusIndication %d %d",
                     rsp->token, statusInd->statusChange);
             retStatus = sapImpl->sapCallback->statusIndication(rsp->token,
                     (SapStatus)statusInd->statusChange);
@@ -877,7 +877,7 @@ void processResponse(MsgHeader *rsp, RilSapSocket *sapSocket, MsgType msgType) {
             SapResultCode transferCardReaderStatusResponse =
                     convertTransferCardReaderStatusResponseProtoToHal(
                     transferStatusRsp->response);
-            RLOGD("processResponse: calling sapCallback->transferCardReaderStatusResponse %d %d %d",
+            RLOGE("processResponse: calling sapCallback->transferCardReaderStatusResponse %d %d %d",
                     rsp->token,
                     transferCardReaderStatusResponse,
                     transferStatusRsp->CardReaderStatus);
@@ -888,7 +888,7 @@ void processResponse(MsgHeader *rsp, RilSapSocket *sapSocket, MsgType msgType) {
         }
 
         case MsgId_RIL_SIM_SAP_ERROR_RESP: {
-            RLOGD("processResponse: calling sapCallback->errorResponse %d", rsp->token);
+            RLOGE("processResponse: calling sapCallback->errorResponse %d", rsp->token);
             retStatus = sapImpl->sapCallback->errorResponse(rsp->token);
             break;
         }
@@ -901,7 +901,7 @@ void processResponse(MsgHeader *rsp, RilSapSocket *sapSocket, MsgType msgType) {
             } else {
                 setTransferProtocolResponse = SapResultCode::NOT_SUPPORTED;
             }
-            RLOGD("processResponse: calling sapCallback->transferProtocolResponse %d %d",
+            RLOGE("processResponse: calling sapCallback->transferProtocolResponse %d %d",
                     rsp->token, setTransferProtocolResponse);
             retStatus = sapImpl->sapCallback->transferProtocolResponse(rsp->token,
                     setTransferProtocolResponse);
@@ -958,8 +958,8 @@ void sap::registerService(RIL_RadioFunctions *callbacks) {
         sapService[i] = new SapImpl;
         sapService[i]->slotId = i;
         sapService[i]->rilSocketId = socketIds[i];
-        RLOGD("registerService: starting ISap %s for slotId %d", serviceNames[i], i);
+        RLOGE("registerService: starting ISap %s for slotId %d", serviceNames[i], i);
         android::status_t status = sapService[i]->registerAsService(serviceNames[i]);
-        RLOGD("registerService: started ISap %s status %d", serviceNames[i], status);
+        RLOGE("registerService: started ISap %s status %d", serviceNames[i], status);
     }
 }
diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc
index dec28a5..26d6f5a 100644
--- a/rootdir/init.qcom.rc
+++ b/rootdir/init.qcom.rc
@@ -546,7 +546,7 @@ service irsc_util /system/bin/irsc_util "/etc/sec_config"
 service mpdecision /system/bin/mpdecision --avg_comp
     class main
     user root
-    group system
+    oneshot
 
 service qcamerasvr /system/bin/mm-qcamera-daemon
     class late_start
@@ -556,7 +556,7 @@ service qcamerasvr /system/bin/mm-qcamera-daemon
 service qmuxd /system/bin/qmuxd
     class main
     user radio
-    group radio audio bluetooth gps diag
+    group radio audio bluetooth gps oem_2950 diag log
 
 service qseecomd /system/bin/qseecomd
     class core
diff --git a/shims/Android.mk b/shims/Android.mk
index bcf5807..87c24e4 100644
--- a/shims/Android.mk
+++ b/shims/Android.mk
@@ -12,4 +12,9 @@ LOCAL_MODULE := libimx175_shim
 LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_MODULE_TAGS := optional
 
+LOCAL_SRC_FILES := sec-ril_shim.cpp
+LOCAL_MODULE := sec-ril_shim
+LOCAL_SHARED_LIBRARIES := liblog
+LOCAL_MODULE_TAGS := optional
+
 include $(BUILD_SHARED_LIBRARY)
diff --git a/shims/sec-ril_shim.cpp b/shims/sec-ril_shim.cpp
new file mode 100644
index 0000000..d67f751
--- /dev/null
+++ b/shims/sec-ril_shim.cpp
@@ -0,0 +1,11 @@
+#include <cutils/log.h>
+#include <sys/types.h>
+#include <dlfcn.h>
+#include <string.h>
+
+extern "C" {
+  int pcap_wrah(void) {
+	ALOGE("%s: pcap_wrap() called!\n", __func__);
+	return 0;
+  }
+}
diff --git a/system.prop b/system.prop
index e9e6d78..a0b432a 100644
--- a/system.prop
+++ b/system.prop
@@ -73,6 +73,8 @@ ro.vendor.extension_library=/vendor/lib/libqti-perfd-client.so
 
 # Radio
 
+ro.debug_level=0x4948
+
 persist.rild.nitz_plmn=""
 persist.rild.nitz_long_ons_0=""
 persist.rild.nitz_long_ons_1=""