commit 22b45625aa72ef9311bf23cd785eccce9535efa5
author Sanket Padawe <sanketpadawe@google.com> Mon May 09 19:08:41 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 09 19:08:41 2016 +0000
tree 53a4fda1a9ecedde12cb6f66b06f9d32632064e3
parent f3769da0a39e2d8116d415f6fd1cba4f1648c03b
parent 405313f9227ceec23196c72d0f49d40175a4f992

Merge "RIL: release unsol wakelock" into nyc-dev

libril/ril.cpp

diff --git a/libril/ril.cpp b/libril/ril.cpp
index 94af22c..c283eaf 100755
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -533,6 +533,13 @@
         return 0;
     }
 
+    // Received an Ack for the previous result sent to RIL.java,
+    // so release wakelock and exit
+    if (request == RIL_RESPONSE_ACKNOWLEDGEMENT) {
+        releaseWakeLock();
+        return 0;
+    }
+
     if (request < 1 || request >= (int32_t)NUM_ELEMS(s_commands)) {
         Parcel pErr;
         RLOGE("unsupported request code %d token %d", request, token);
@@ -545,14 +552,6 @@
         return 0;
     }
 
-    // Received an Ack for the previous result sent to RIL.java,
-    // so release wakelock and exit
-    if (request == RIL_RESPONSE_ACKNOWLEDGEMENT) {
-        releaseWakeLock();
-        return 0;
-    }
-
-
     pRI = (RequestInfo *)calloc(1, sizeof(RequestInfo));
     if (pRI == NULL) {
         RLOGE("Memory allocation failed for request %s", requestToString(request));