diff options
author | Nanik Tolaram <nanikjava@gmail.com> | 2015-02-03 12:50:04 +1100 |
---|---|---|
committer | Ethan Chen <intervigil@gmail.com> | 2015-10-19 12:16:41 -0700 |
commit | 6187ef8378fcc69a6bff22eb72eb4b93cac4d868 (patch) | |
tree | a4bce4b2f313f6706e2443bc4f90216fbb9a848a | |
parent | 4c4ae39dece89336f82c9467094c55816beb0bac (diff) | |
download | android_hardware_samsung-6187ef8378fcc69a6bff22eb72eb4b93cac4d868.tar.gz android_hardware_samsung-6187ef8378fcc69a6bff22eb72eb4b93cac4d868.tar.bz2 android_hardware_samsung-6187ef8378fcc69a6bff22eb72eb4b93cac4d868.zip |
Removal of dead code and adding log messages to make it easier
for debugging
- Add more logging using ALOGD(..) for function dispatchSmsWrite,
dispatchDial, dispatchSIM_IO, dispatchSIM_APDU, dispatchCallForward,
dispatchRaw and dispatchCdmaSmsAck. To make it easier for debugging.
- Remove commented log message inside wakeTimeoutCallback () function
and remove the else clause as it's dead not used for anything.
- Modify log message inside removeFromList and removeWatch using +
and - to make it consistent with the other log message.
Change-Id: Ife0212e6a4724d8b06a1dd767484bfdf98b8e1a6
Signed-off-by: Nanik Tolaram <nanikjava@gmail.com>
-rw-r--r-- | ril/libril/ril.cpp | 10 | ||||
-rw-r--r-- | ril/libril/ril_event.cpp | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/ril/libril/ril.cpp b/ril/libril/ril.cpp index 890e738..975518d 100644 --- a/ril/libril/ril.cpp +++ b/ril/libril/ril.cpp @@ -741,6 +741,7 @@ dispatchSmsWrite (Parcel &p, RequestInfo *pRI) { int32_t t; status_t status; + ALOGD("dispatchSmsWrite"); memset (&args, 0, sizeof(args)); status = p.readInt32(&t); @@ -796,6 +797,7 @@ dispatchDial (Parcel &p, RequestInfo *pRI) { #endif status_t status; + ALOGD("dispatchDial"); memset (&dial, 0, sizeof(dial)); dial.address = strdupReadString(p); @@ -929,6 +931,7 @@ dispatchSIM_IO (Parcel &p, RequestInfo *pRI) { int size; status_t status; + ALOGD("dispatchSIM_IO"); memset (&simIO, 0, sizeof(simIO)); // note we only check status at the end @@ -1006,6 +1009,7 @@ dispatchSIM_APDU (Parcel &p, RequestInfo *pRI) { status_t status; RIL_SIM_APDU apdu; + ALOGD("dispatchSIM_APDU"); memset (&apdu, 0, sizeof(RIL_SIM_APDU)); // Note we only check status at the end. Any single failure leads to @@ -1075,6 +1079,7 @@ dispatchCallForward(Parcel &p, RequestInfo *pRI) { int32_t t; status_t status; + ALOGD("dispatchCallForward"); memset (&cff, 0, sizeof(cff)); // note we only check status at the end @@ -1418,6 +1423,7 @@ dispatchCdmaSmsAck(Parcel &p, RequestInfo *pRI) { status_t status; int32_t digitCount; + ALOGD("dispatchCdmaSmsAck"); memset(&rcsa, 0, sizeof(rcsa)); status = p.readInt32(&t); @@ -4606,11 +4612,7 @@ static void wakeTimeoutCallback (void *param) { // We're using "param != NULL" as a cancellation mechanism if (param == NULL) { - //RLOGD("wakeTimeout: releasing wake lock"); - releaseWakeLock(); - } else { - //RLOGD("wakeTimeout: releasing wake lock CANCELLED"); } } diff --git a/ril/libril/ril_event.cpp b/ril/libril/ril_event.cpp index 6bdf59d..84b8b72 100644 --- a/ril/libril/ril_event.cpp +++ b/ril/libril/ril_event.cpp @@ -120,18 +120,20 @@ static void addToList(struct ril_event * ev, struct ril_event * list) static void removeFromList(struct ril_event * ev) { - dlog("~~~~ Removing event ~~~~"); + dlog("~~~~ +removeFromList ~~~~"); dump_event(ev); ev->next->prev = ev->prev; ev->prev->next = ev->next; ev->next = NULL; ev->prev = NULL; + dlog("~~~~ -removeFromList ~~~~"); } static void removeWatch(struct ril_event * ev, int index) { + dlog("~~~~ +removeWatch ~~~~"); watch_table[index] = NULL; ev->index = -1; @@ -150,6 +152,7 @@ static void removeWatch(struct ril_event * ev, int index) nfds = n + 1; dlog("~~~~ nfds = %d ~~~~", nfds); } + dlog("~~~~ -removeWatch ~~~~"); } static void processTimeouts() |