commit fe50a8feaf1805fa2f55937a43581078dcb7ece8
author Linux Build Service Account <lnxbuild@localhost> Tue Mar 13 00:59:35 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Mar 13 00:59:35 2018 -0700
tree b87d24ebdcaf2ccd5cb37f2ddf161f4b5402e659
parent b122cf3c001a26a27b9f40fcf22c8904db759098
parent 789c2489458ad6e26e882441e90198145d3052b6

Merge "Fix getVersionString to adapt file format change"

sdm845/android/Gnss.cpp

diff --git a/sdm845/android/Gnss.cpp b/sdm845/android/Gnss.cpp
index 4e0946e..878cd20 100644
--- a/sdm845/android/Gnss.cpp
+++ b/sdm845/android/Gnss.cpp
@@ -52,19 +52,21 @@
         if (std::string::npos == found) {
             continue;
         }
-        s.erase(0, found + 4);
-        s.erase(0, s.find_first_not_of(" "));
-        if (s.find("11:") != 0) {
+
+        // skip over space characters after "CRM:"
+        const char* substr = s.c_str();
+        found += 4;
+        while (0 != substr[found] && isspace(substr[found])) {
+            found++;
+        }
+        if (s.find("11:") != found) {
             continue;
         }
-        s.erase(0, 3);
-        found = s.find("\r");
+        s.erase(0, found + 3);
+
+        found = s.find_first_of("\r\n");
         if (std::string::npos != found) {
-            s.erase(s.begin() + found);
-        }
-        found = s.find("\n");
-        if (std::string::npos != found) {
-            s.erase(s.begin() + found);
+            s.erase(s.begin() + found, s.end());
         }
         version.append(s).append(DELIMITER);
     }