commit 749e9b49c3220896d91d24db72d491b09c1320c6
author The Android Automerger <android-build@google.com> Thu Jun 09 00:04:06 2016 -0700
committer The Android Automerger <android-build@google.com> Thu Jun 09 00:04:06 2016 -0700
tree ce8bb36176b9fafb906856c0055e88aada3abf37
parent 626099ec9b53f7480d2f2ab5522eeb40c99de549
parent a9552f046122b63eea11c19a5c653d945ce18cca

merge in nyc-release history after reset to nyc-dev

libril/ril.cpp

diff --git a/libril/ril.cpp b/libril/ril.cpp
index c283eaf..e1d30ea 100755
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -3069,9 +3069,10 @@
         return RIL_ERRNO_INVALID_RESPONSE;
     }
 
+    RIL_SignalStrength_v10 *p_cur;
     if (s_callbacks.version <= LAST_IMPRECISE_RIL_VERSION) {
         if (responselen >= sizeof (RIL_SignalStrength_v5)) {
-            RIL_SignalStrength_v10 *p_cur = ((RIL_SignalStrength_v10 *) response);
+            p_cur = ((RIL_SignalStrength_v10 *) response);
 
             responseRilSignalStrengthV5(p, p_cur);
 
@@ -3103,7 +3104,7 @@
                 assert(0);
             }
         }
-        RIL_SignalStrength_v10 *p_cur = ((RIL_SignalStrength_v10 *) response);
+        p_cur = ((RIL_SignalStrength_v10 *) response);
         responseRilSignalStrengthV10(p, p_cur);
     }
     startResponse;