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

am d8f1a540: Merge "Refrain warning when not appropriate. Do not merge" into gingerbread

Browse Source 
Merge commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2' into gingerbread-plus-aosp

* commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2':
  Refrain warning when not appropriate. Do not merge
This commit is contained in:
Daisuke Miyakawa
2010-10-04 08:36:27 -07:00
committed by Android Git Automerger
parent ac7540733c d8f1a54016
commit 07fb33efe8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/pim/vcard/VCardBuilder.java
View File

@@ -133,9 +133,11 @@ public class VCardBuilder {
public VCardBuilder(final int vcardType, String charset) { public VCardBuilder(final int vcardType, String charset) {
mVCardType = vcardType; mVCardType = vcardType;
Log.w(LOG_TAG, if (VCardConfig.isVersion40(vcardType)) {
"Should not use vCard 4.0 when building vCard. " + Log.w(LOG_TAG,
"It is not officially published yet."); "Should not use vCard 4.0 when building vCard. " +
"It is not officially published yet.");
}
mIsV30OrV40 = VCardConfig.isVersion30(vcardType) || VCardConfig.isVersion40(vcardType); mIsV30OrV40 = VCardConfig.isVersion30(vcardType) || VCardConfig.isVersion40(vcardType);
mShouldUseQuotedPrintable = VCardConfig.shouldUseQuotedPrintable(vcardType); mShouldUseQuotedPrintable = VCardConfig.shouldUseQuotedPrintable(vcardType);