Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6d02f3f3: Merge change I71f48a21 into eclair

Browse Source 
Merge commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84' into eclair-mr2

* commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84':
  Reduce the amount of EriManager Logging.
This commit is contained in:
Robert Greenwalt
2009-10-12 12:33:42 -07:00
committed by Android Git Automerger
parent 0c559a4b0f 6d02f3f3ff
commit 1cf6c2c3cc
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
telephony/java/com/android/internal/telephony/cdma/EriManager.java
View File

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