Fix logging level and remove nmea log

Logging level should be 2 by default to
prevent excessive logging by default.
Nmea log print is removed, as it can be
excessive during gps tracking.

Bugs: 29499503 29272976
Change-Id: Ia60295207b6bbbcb24bbede4f1802c0c7a2f2544
diff --git a/etc/gps.conf b/etc/gps.conf
index a1d5d2c..caecdbd 100644
--- a/etc/gps.conf
+++ b/etc/gps.conf
@@ -28,7 +28,7 @@
 # DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info
 #               4 - Debug, 5 - Verbose
 # If DEBUG_LEVEL is commented, Android's logging levels will be used
-DEBUG_LEVEL = 3
+DEBUG_LEVEL = 2
 
 # Intermediate position report, 1=enable, 0=disable
 INTERMEDIATE_POS=0
diff --git a/loc_api/libloc_api_50001/loc_eng.cpp b/loc_api/libloc_api_50001/loc_eng.cpp
index e3e52d4..7c62aa8 100644
--- a/loc_api/libloc_api_50001/loc_eng.cpp
+++ b/loc_api/libloc_api_50001/loc_eng.cpp
@@ -901,7 +901,6 @@
     struct timeval tv;
     gettimeofday(&tv, (struct timezone *) NULL);
     int64_t now = tv.tv_sec * 1000LL + tv.tv_usec / 1000;
-    CALLBACK_LOG_CALLFLOW("nmea_cb", %d, mLen);
 
     if (locEng->nmea_cb != NULL)
         locEng->nmea_cb(now, mNmea, mLen);
diff --git a/loc_api/libloc_api_50001/loc_eng_nmea.cpp b/loc_api/libloc_api_50001/loc_eng_nmea.cpp
index 4c6b9a3..2485c59 100644
--- a/loc_api/libloc_api_50001/loc_eng_nmea.cpp
+++ b/loc_api/libloc_api_50001/loc_eng_nmea.cpp
@@ -59,7 +59,6 @@
     struct timeval tv;
     gettimeofday(&tv, (struct timezone *) NULL);
     int64_t now = tv.tv_sec * 1000LL + tv.tv_usec / 1000;
-    CALLBACK_LOG_CALLFLOW("nmea_cb", %p, pNmea);
     if (loc_eng_data_p->nmea_cb != NULL)
         loc_eng_data_p->nmea_cb(now, pNmea, length);
     LOC_LOGD("NMEA <%s", pNmea);
diff --git a/msm8084/etc/gps.conf b/msm8084/etc/gps.conf
index 01fee6c..fb8a312 100644
--- a/msm8084/etc/gps.conf
+++ b/msm8084/etc/gps.conf
@@ -21,7 +21,7 @@
 # DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info
 #               4 - Debug, 5 - Verbose
 # If DEBUG_LEVEL is commented, Android's logging levels will be used
-DEBUG_LEVEL = 3
+DEBUG_LEVEL = 2
 
 # Intermediate position report, 1=enable, 0=disable
 INTERMEDIATE_POS=0
diff --git a/msm8084/loc_api/libloc_api_50001/loc_eng.cpp b/msm8084/loc_api/libloc_api_50001/loc_eng.cpp
index cba5ffa..3c687e8 100644
--- a/msm8084/loc_api/libloc_api_50001/loc_eng.cpp
+++ b/msm8084/loc_api/libloc_api_50001/loc_eng.cpp
@@ -923,7 +923,6 @@
     struct timeval tv;
     gettimeofday(&tv, (struct timezone *) NULL);
     int64_t now = tv.tv_sec * 1000LL + tv.tv_usec / 1000;
-    CALLBACK_LOG_CALLFLOW("nmea_cb", %d, mLen);
 
     if (locEng->nmea_cb != NULL)
         locEng->nmea_cb(now, mNmea, mLen);
diff --git a/msm8084/loc_api/libloc_api_50001/loc_eng_nmea.cpp b/msm8084/loc_api/libloc_api_50001/loc_eng_nmea.cpp
index 842eda1..978f7a9 100644
--- a/msm8084/loc_api/libloc_api_50001/loc_eng_nmea.cpp
+++ b/msm8084/loc_api/libloc_api_50001/loc_eng_nmea.cpp
@@ -59,7 +59,6 @@
     struct timeval tv;
     gettimeofday(&tv, (struct timezone *) NULL);
     int64_t now = tv.tv_sec * 1000LL + tv.tv_usec / 1000;
-    CALLBACK_LOG_CALLFLOW("nmea_cb", %p, pNmea);
     if (loc_eng_data_p->nmea_cb != NULL)
         loc_eng_data_p->nmea_cb(now, pNmea, length);
     LOC_LOGD("NMEA <%s", pNmea);
diff --git a/msm8909/etc/gps.conf b/msm8909/etc/gps.conf
index 4e6b436..7eabb78 100644
--- a/msm8909/etc/gps.conf
+++ b/msm8909/etc/gps.conf
@@ -28,7 +28,7 @@
 # DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info
 #               4 - Debug, 5 - Verbose
 # If DEBUG_LEVEL is commented, Android's logging levels will be used
-DEBUG_LEVEL = 3
+DEBUG_LEVEL = 2
 
 # Intermediate position report, 1=enable, 0=disable
 INTERMEDIATE_POS=0
diff --git a/msm8909/loc_api/libloc_api_50001/loc_eng.cpp b/msm8909/loc_api/libloc_api_50001/loc_eng.cpp
index 73b0226..f44dd72 100644
--- a/msm8909/loc_api/libloc_api_50001/loc_eng.cpp
+++ b/msm8909/loc_api/libloc_api_50001/loc_eng.cpp
@@ -902,7 +902,6 @@
     struct timeval tv;
     gettimeofday(&tv, (struct timezone *) NULL);
     int64_t now = tv.tv_sec * 1000LL + tv.tv_usec / 1000;
-    CALLBACK_LOG_CALLFLOW("nmea_cb", %d, mLen);
 
     if (locEng->nmea_cb != NULL)
         locEng->nmea_cb(now, mNmea, mLen);
diff --git a/msm8909/loc_api/libloc_api_50001/loc_eng_nmea.cpp b/msm8909/loc_api/libloc_api_50001/loc_eng_nmea.cpp
index 0b1237c..9ed0053 100644
--- a/msm8909/loc_api/libloc_api_50001/loc_eng_nmea.cpp
+++ b/msm8909/loc_api/libloc_api_50001/loc_eng_nmea.cpp
@@ -59,7 +59,6 @@
     struct timeval tv;
     gettimeofday(&tv, (struct timezone *) NULL);
     int64_t now = tv.tv_sec * 1000LL + tv.tv_usec / 1000;
-    CALLBACK_LOG_CALLFLOW("nmea_cb", %p, pNmea);
     if (loc_eng_data_p->nmea_cb != NULL)
         loc_eng_data_p->nmea_cb(now, pNmea, length);
     LOC_LOGD("NMEA <%s", pNmea);
diff --git a/msm8960/loc_api/libloc_api_50001/loc_eng.cpp b/msm8960/loc_api/libloc_api_50001/loc_eng.cpp
index 357cf63..ade891e 100644
--- a/msm8960/loc_api/libloc_api_50001/loc_eng.cpp
+++ b/msm8960/loc_api/libloc_api_50001/loc_eng.cpp
@@ -856,7 +856,6 @@
     struct timeval tv;
     gettimeofday(&tv, (struct timezone *) NULL);
     int64_t now = tv.tv_sec * 1000LL + tv.tv_usec / 1000;
-    CALLBACK_LOG_CALLFLOW("nmea_cb", %d, mLen);
     locEng->nmea_cb(now, mNmea, mLen);
 }
 inline void LocEngReportNmea::locallog() const {
diff --git a/msm8960/loc_api/libloc_api_50001/loc_eng_nmea.cpp b/msm8960/loc_api/libloc_api_50001/loc_eng_nmea.cpp
index f5f746b..3ac722f 100644
--- a/msm8960/loc_api/libloc_api_50001/loc_eng_nmea.cpp
+++ b/msm8960/loc_api/libloc_api_50001/loc_eng_nmea.cpp
@@ -56,7 +56,6 @@
     struct timeval tv;
     gettimeofday(&tv, (struct timezone *) NULL);
     int64_t now = tv.tv_sec * 1000LL + tv.tv_usec / 1000;
-    CALLBACK_LOG_CALLFLOW("nmea_cb", %p, pNmea);
     loc_eng_data_p->nmea_cb(now, pNmea, length);
     LOC_LOGD("NMEA <%s", pNmea);
 }
diff --git a/msm8996/etc/gps.conf b/msm8996/etc/gps.conf
index f415314..b52ea11 100644
--- a/msm8996/etc/gps.conf
+++ b/msm8996/etc/gps.conf
@@ -22,7 +22,7 @@
 # DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info
 #               4 - Debug, 5 - Verbose
 # If DEBUG_LEVEL is commented, Android's logging levels will be used
-DEBUG_LEVEL = 3
+DEBUG_LEVEL = 2
 
 # Intermediate position report, 1=enable, 0=disable
 INTERMEDIATE_POS=0
diff --git a/msm8996/loc_api/libloc_api_50001/loc_eng.cpp b/msm8996/loc_api/libloc_api_50001/loc_eng.cpp
index e39242c..964d878 100644
--- a/msm8996/loc_api/libloc_api_50001/loc_eng.cpp
+++ b/msm8996/loc_api/libloc_api_50001/loc_eng.cpp
@@ -902,7 +902,6 @@
     struct timeval tv;
     gettimeofday(&tv, (struct timezone *) NULL);
     int64_t now = tv.tv_sec * 1000LL + tv.tv_usec / 1000;
-    CALLBACK_LOG_CALLFLOW("nmea_cb", %d, mLen);
 
     if (locEng->nmea_cb != NULL)
         locEng->nmea_cb(now, mNmea, mLen);
diff --git a/msm8996/loc_api/libloc_api_50001/loc_eng_nmea.cpp b/msm8996/loc_api/libloc_api_50001/loc_eng_nmea.cpp
index 95338f5..4083c76 100644
--- a/msm8996/loc_api/libloc_api_50001/loc_eng_nmea.cpp
+++ b/msm8996/loc_api/libloc_api_50001/loc_eng_nmea.cpp
@@ -55,7 +55,6 @@
     struct timeval tv;
     gettimeofday(&tv, (struct timezone *) NULL);
     int64_t now = tv.tv_sec * 1000LL + tv.tv_usec / 1000;
-    CALLBACK_LOG_CALLFLOW("nmea_cb", %p, pNmea);
     if (loc_eng_data_p->nmea_cb != NULL)
         loc_eng_data_p->nmea_cb(now, pNmea, length);
     LOC_LOGD("NMEA <%s", pNmea);