diff options
| author | Robert Greenwalt <robdroid@android.com> | 2009-10-12 12:38:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-12 12:38:57 -0700 |
| commit | e93f07c3f8148ae249292ef05d2da8ac65428950 (patch) | |
| tree | 4b80808b2ecbaf760fefb5c2ff8d77a3859d5db6 /telephony | |
| parent | 0b2dd95d2ead61241688a121ae1c6a5092149ef6 (diff) | |
| parent | 1cf6c2c3cc397333653b6f061db4ca9f5d88c7f3 (diff) | |
| download | frameworks_base-e93f07c3f8148ae249292ef05d2da8ac65428950.zip frameworks_base-e93f07c3f8148ae249292ef05d2da8ac65428950.tar.gz frameworks_base-e93f07c3f8148ae249292ef05d2da8ac65428950.tar.bz2 | |
am 1cf6c2c3: am 6d02f3f3: Merge change I71f48a21 into eclair
Merge commit '1cf6c2c3cc397333653b6f061db4ca9f5d88c7f3' into eclair-mr2-plus-aosp
* commit '1cf6c2c3cc397333653b6f061db4ca9f5d88c7f3':
Reduce the amount of EriManager Logging.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/cdma/EriManager.java | 18 |
1 files 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 44c6173..c018c3f 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; } |