Merge "This code hasn't used CharsetUtils since 2011. Time to let it die."android-l-preview_r2l-previewidea133-weekly-releaseidea133

3 files changed, 0 insertions, 70 deletions

diff --git a/java/com/android/vcard/VCardBuilder.java b/java/com/android/vcard/VCardBuilder.java
index 41d1f34..d273347 100644
--- a/java/com/android/vcard/VCardBuilder.java
+++ b/java/com/android/vcard/VCardBuilder.java
@@ -165,35 +165,9 @@ public class VCardBuilder {
                 if (TextUtils.isEmpty(charset)) {
                     mCharset = SHIFT_JIS;
                 } else {
-                    /*try {
-                        charset = CharsetUtils.charsetForVendor(charset).name();
-                    } catch (UnsupportedCharsetException e) {
-                        Log.i(LOG_TAG,
-                                "Career-specific \"" + charset + "\" was not found (as usual). "
-                                + "Use it as is.");
-                    }*/
                     mCharset = charset;
                 }
             } else {
-                /*if (mIsDoCoMo) {
-                    try {
-                        charset = CharsetUtils.charsetForVendor(SHIFT_JIS, "docomo").name();
-                    } catch (UnsupportedCharsetException e) {
-                        Log.e(LOG_TAG,
-                                "DoCoMo-specific SHIFT_JIS was not found. "
-                                + "Use SHIFT_JIS as is.");
-                        charset = SHIFT_JIS;
-                    }
-                } else {
-                    try {
-                        charset = CharsetUtils.charsetForVendor(SHIFT_JIS).name();
-                    } catch (UnsupportedCharsetException e) {
-                        Log.e(LOG_TAG,
-                                "Career-specific SHIFT_JIS was not found. "
-                                + "Use SHIFT_JIS as is.");
-                        charset = SHIFT_JIS;
-                    }
-                }*/
                 mCharset = charset;
             }
             mVCardCharsetParameter = "CHARSET=" + SHIFT_JIS;
@@ -205,14 +179,6 @@ public class VCardBuilder {
                 mCharset = VCardConfig.DEFAULT_EXPORT_CHARSET;
                 mVCardCharsetParameter = "CHARSET=" + VCardConfig.DEFAULT_EXPORT_CHARSET;
             } else {
-                /*
-                try {
-                    charset = CharsetUtils.charsetForVendor(charset).name();
-                } catch (UnsupportedCharsetException e) {
-                    Log.i(LOG_TAG,
-                            "Career-specific \"" + charset + "\" was not found (as usual). "
-                            + "Use it as is.");
-                }*/
                 mCharset = charset;
                 mVCardCharsetParameter = "CHARSET=" + charset;
             }
diff --git a/java/com/android/vcard/VCardComposer.java b/java/com/android/vcard/VCardComposer.java
index 2f9e8ec..7374553 100644
--- a/java/com/android/vcard/VCardComposer.java
+++ b/java/com/android/vcard/VCardComposer.java
@@ -213,27 +213,7 @@ public class VCardComposer {
                 VCardConfig.isVersion30(vcardType) && UTF_8.equalsIgnoreCase(charset));
 
         if (mIsDoCoMo || shouldAppendCharsetParam) {
-            // TODO: clean up once we're sure CharsetUtils are really unnecessary any more.
             if (SHIFT_JIS.equalsIgnoreCase(charset)) {
-                /*if (mIsDoCoMo) {
-                    try {
-                        charset = CharsetUtils.charsetForVendor(SHIFT_JIS, "docomo").name();
-                    } catch (UnsupportedCharsetException e) {
-                        Log.e(LOG_TAG,
-                                "DoCoMo-specific SHIFT_JIS was not found. "
-                                + "Use SHIFT_JIS as is.");
-                        charset = SHIFT_JIS;
-                    }
-                } else {
-                    try {
-                        charset = CharsetUtils.charsetForVendor(SHIFT_JIS).name();
-                    } catch (UnsupportedCharsetException e) {
-                        // Log.e(LOG_TAG,
-                        // "Career-specific SHIFT_JIS was not found. "
-                        // + "Use SHIFT_JIS as is.");
-                        charset = SHIFT_JIS;
-                    }
-                }*/
                 mCharset = charset;
             } else {
                 /* Log.w(LOG_TAG,
@@ -242,14 +222,6 @@ public class VCardComposer {
                 if (TextUtils.isEmpty(charset)) {
                     mCharset = SHIFT_JIS;
                 } else {
-                    /*
-                    try {
-                        charset = CharsetUtils.charsetForVendor(charset).name();
-                    } catch (UnsupportedCharsetException e) {
-                        Log.i(LOG_TAG,
-                                "Career-specific \"" + charset + "\" was not found (as usual). "
-                                + "Use it as is.");
-                    }*/
                     mCharset = charset;
                 }
             }
@@ -257,13 +229,6 @@ public class VCardComposer {
             if (TextUtils.isEmpty(charset)) {
                 mCharset = UTF_8;
             } else {
-                /*try {
-                    charset = CharsetUtils.charsetForVendor(charset).name();
-                } catch (UnsupportedCharsetException e) {
-                    Log.i(LOG_TAG,
-                            "Career-specific \"" + charset + "\" was not found (as usual). "
-                            + "Use it as is.");
-                }*/
                 mCharset = charset;
             }
         }
diff --git a/tests/src/com/android/vcard/tests/testutils/VNodeBuilder.java b/tests/src/com/android/vcard/tests/testutils/VNodeBuilder.java
index 155e4fb..560f352 100644
--- a/tests/src/com/android/vcard/tests/testutils/VNodeBuilder.java
+++ b/tests/src/com/android/vcard/tests/testutils/VNodeBuilder.java
@@ -22,7 +22,6 @@ import com.android.vcard.VCardUtils;
 
 import android.content.ContentValues;
 import android.util.Base64;
-import android.util.CharsetUtils;
 import android.util.Log;
 
 import java.io.UnsupportedEncodingException;