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

am ccc214b2: Merge change I6a0b14bd into eclair

Browse Source 
Merge commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae' into eclair-mr2

* commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae':
  Make VCardComposer create the instance for mHandlerList.
This commit is contained in:
Daisuke Miyakawa
2009-10-06 10:53:52 -07:00
committed by Android Git Automerger
parent 6cd206abe2 ccc214b21e
commit 629f94fac7
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/pim/vcard/VCardComposer.java
View File

@@ -294,7 +294,7 @@ public class VCardComposer {
private final String mCharsetString; private final String mCharsetString;
private final String mVCardAttributeCharset; private final String mVCardAttributeCharset;
private boolean mTerminateIsCalled; private boolean mTerminateIsCalled;
private List<OneEntryHandler> mHandlerList; final private List<OneEntryHandler> mHandlerList;
private String mErrorReason = NO_ERROR; private String mErrorReason = NO_ERROR;
@@ -371,6 +371,7 @@ public class VCardComposer {
mUsesUtf8 = VCardConfig.usesUtf8(vcardType); mUsesUtf8 = VCardConfig.usesUtf8(vcardType);
mUsesShiftJis = VCardConfig.usesShiftJis(vcardType); mUsesShiftJis = VCardConfig.usesShiftJis(vcardType);
mUsesQPToPrimaryProperties = VCardConfig.usesQPToPrimaryProperties(vcardType); mUsesQPToPrimaryProperties = VCardConfig.usesQPToPrimaryProperties(vcardType);
mHandlerList = new ArrayList<OneEntryHandler>();
if (mIsDoCoMo) { if (mIsDoCoMo) {
mCharsetString = CharsetUtils.charsetForVendor(SHIFT_JIS, "docomo").name(); mCharsetString = CharsetUtils.charsetForVendor(SHIFT_JIS, "docomo").name();
@@ -420,9 +421,6 @@ public class VCardComposer {
* Must call before {{@link #init()}. * Must call before {{@link #init()}.
*/ */
public void addHandler(OneEntryHandler handler) { public void addHandler(OneEntryHandler handler) {
if (mHandlerList == null) {
mHandlerList = new ArrayList<OneEntryHandler>();
}
mHandlerList.add(handler); mHandlerList.add(handler);
} }