drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I6a0b14bd into eclair

Browse Source 
* changes:
  Make VCardComposer create the instance for mHandlerList.
This commit is contained in:
Android (Google) Code Review
2009-10-06 13:48:11 -04:00
parent 9c3c276afa 0dd32c1b27
commit ccc214b21e
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 mVCardAttributeCharset;
private boolean mTerminateIsCalled;
private List<OneEntryHandler> mHandlerList;
final private List<OneEntryHandler> mHandlerList;
private String mErrorReason = NO_ERROR;
@ -371,6 +371,7 @@ public class VCardComposer {
mUsesUtf8 = VCardConfig.usesUtf8(vcardType);
mUsesShiftJis = VCardConfig.usesShiftJis(vcardType);
mUsesQPToPrimaryProperties = VCardConfig.usesQPToPrimaryProperties(vcardType);
mHandlerList = new ArrayList<OneEntryHandler>();
if (mIsDoCoMo) {
mCharsetString = CharsetUtils.charsetForVendor(SHIFT_JIS, "docomo").name();
@ -420,9 +421,6 @@ public class VCardComposer {
* Must call before {{@link #init()}.
*/
public void addHandler(OneEntryHandler handler) {
if (mHandlerList == null) {
mHandlerList = new ArrayList<OneEntryHandler>();
}
mHandlerList.add(handler);
}