From 71f48a21b0533a5b9dc1c0eab3c675800b78fa5e Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <robdroid@android.com>
Date: Mon, 12 Oct 2009 12:13:14 -0700
Subject: [PATCH] Reduce the amount of EriManager Logging.

It was filling the radio log with noise.  Added a VDBG set to false to preserve the logging
but deactivate it.

bug: 2180891
---
 .../internal/telephony/cdma/EriManager.java    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/telephony/java/com/android/internal/telephony/cdma/EriManager.java b/telephony/java/com/android/internal/telephony/cdma/EriManager.java
index 44c6173401b6b..c018c3f5b638f 100644
--- a/telephony/java/com/android/internal/telephony/cdma/EriManager.java
+++ b/telephony/java/com/android/internal/telephony/cdma/EriManager.java
@@ -85,6 +85,7 @@ public final class EriManager {
 
     private static final String LOG_TAG = "CDMA";
     private static final boolean DBG = true;
+    private static final boolean VDBG = false;
 
     public static final int ERI_FROM_XML          = 0;
     public static final int ERI_FROM_FILE_SYSTEM  = 1;
@@ -387,14 +388,14 @@ public final class EriManager {
                 // ERI file NOT loaded
                 if (DBG) Log.d(LOG_TAG, "ERI File not loaded");
                 if(defRoamInd > 2) {
-                    if (DBG) Log.d(LOG_TAG, "ERI defRoamInd > 2 ...flashing");
+                    if (VDBG) Log.v(LOG_TAG, "ERI defRoamInd > 2 ...flashing");
                     ret = new EriDisplayInformation(
                             EriInfo.ROAMING_INDICATOR_FLASH,
                             EriInfo.ROAMING_ICON_MODE_FLASH,
                             mContext.getText(com.android.internal
                                                             .R.string.roamingText2).toString());
                 } else {
-                    if (DBG) Log.d(LOG_TAG, "ERI defRoamInd <= 2");
+                    if (VDBG) Log.v(LOG_TAG, "ERI defRoamInd <= 2");
                     switch (defRoamInd) {
                     case EriInfo.ROAMING_INDICATOR_ON:
                         ret = new EriDisplayInformation(
@@ -426,12 +427,11 @@ public final class EriManager {
                 }
             } else {
                 // ERI file loaded
-                if (DBG) Log.d(LOG_TAG, "ERI File loaded");
                 EriInfo eriInfo = getEriInfo(roamInd);
                 EriInfo defEriInfo = getEriInfo(defRoamInd);
                 if (eriInfo == null) {
-                    if (DBG) {
-                        Log.d(LOG_TAG, "ERI roamInd " + roamInd
+                    if (VDBG) {
+                        Log.v(LOG_TAG, "ERI roamInd " + roamInd
                             + " not found in ERI file ...using defRoamInd " + defRoamInd);
                     }
                     if(defEriInfo == null) {
@@ -444,8 +444,8 @@ public final class EriManager {
                                                              .R.string.roamingText0).toString());
 
                     } else {
-                        if (DBG) {
-                            Log.d(LOG_TAG, "ERI defRoamInd " + defRoamInd + " found in ERI file");
+                        if (VDBG) {
+                            Log.v(LOG_TAG, "ERI defRoamInd " + defRoamInd + " found in ERI file");
                         }
                         ret = new EriDisplayInformation(
                                 defEriInfo.mIconIndex,
@@ -453,7 +453,7 @@ public final class EriManager {
                                 defEriInfo.mEriText);
                     }
                 } else {
-                    if (DBG) Log.d(LOG_TAG, "ERI roamInd " + roamInd + " found in ERI file");
+                    if (VDBG) Log.v(LOG_TAG, "ERI roamInd " + roamInd + " found in ERI file");
                     ret = new EriDisplayInformation(
                             eriInfo.mIconIndex,
                             eriInfo.mIconMode,
@@ -462,7 +462,7 @@ public final class EriManager {
             }
             break;
         }
-        if (DBG) Log.d(LOG_TAG, "Displaying ERI " + ret.toString());
+        if (VDBG) Log.v(LOG_TAG, "Displaying ERI " + ret.toString());
         return ret;
     }