Merge change I71f48a21 into eclair (6d02f3f3) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/cdma/EriManager.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -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;
		}