diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-10-04 08:36:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 08:36:27 -0700 |
| commit | 07fb33efe8b0cbedf518a8afa20d96d8d4bab69a (patch) | |
| tree | 84da3980dc309c5ff0951d10357a196c34903b0a | |
| parent | ac7540733cafcca5bdb1842e1ebcb396ba064583 (diff) | |
| parent | d8f1a540162e16d88cae9a1e8ec58cba68adf6e2 (diff) | |
| download | frameworks_base-07fb33efe8b0cbedf518a8afa20d96d8d4bab69a.zip frameworks_base-07fb33efe8b0cbedf518a8afa20d96d8d4bab69a.tar.gz frameworks_base-07fb33efe8b0cbedf518a8afa20d96d8d4bab69a.tar.bz2 | |
am d8f1a540: Merge "Refrain warning when not appropriate. Do not merge" into gingerbread
Merge commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2' into gingerbread-plus-aosp
* commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2':
Refrain warning when not appropriate. Do not merge
| -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); |