diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-10-04 08:31:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-04 08:31:56 -0700 |
| commit | d8f1a540162e16d88cae9a1e8ec58cba68adf6e2 (patch) | |
| tree | 933300050e0aebb3dc3d779edbde5501fcfeb23b | |
| parent | b58b27142a936aa76897a7040c08b8a0989a685b (diff) | |
| parent | 8eef13b47268cec08074c80547e7e3800347843b (diff) | |
| download | frameworks_base-d8f1a540162e16d88cae9a1e8ec58cba68adf6e2.zip frameworks_base-d8f1a540162e16d88cae9a1e8ec58cba68adf6e2.tar.gz frameworks_base-d8f1a540162e16d88cae9a1e8ec58cba68adf6e2.tar.bz2 | |
Merge "Refrain warning when not appropriate. Do not merge" into gingerbread
| -rw-r--r-- | core/java/android/pim/vcard/VCardBuilder.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/pim/vcard/VCardBuilder.java b/core/java/android/pim/vcard/VCardBuilder.java index b2007f2..58f6ebe 100644 --- a/core/java/android/pim/vcard/VCardBuilder.java +++ b/core/java/android/pim/vcard/VCardBuilder.java @@ -133,9 +133,11 @@ public class VCardBuilder { public VCardBuilder(final int vcardType, String charset) { mVCardType = vcardType; - Log.w(LOG_TAG, - "Should not use vCard 4.0 when building vCard. " + - "It is not officially published yet."); + if (VCardConfig.isVersion40(vcardType)) { + Log.w(LOG_TAG, + "Should not use vCard 4.0 when building vCard. " + + "It is not officially published yet."); + } mIsV30OrV40 = VCardConfig.isVersion30(vcardType) || VCardConfig.isVersion40(vcardType); mShouldUseQuotedPrintable = VCardConfig.shouldUseQuotedPrintable(vcardType); |