3 files changed, 4 insertions, 6 deletions
diff --git a/core/java/android/bluetooth/BluetoothServerSocket.java b/core/java/android/bluetooth/BluetoothServerSocket.java
index c14e4c0..d126ea4 100644
--- a/core/java/android/bluetooth/BluetoothServerSocket.java
+++ b/core/java/android/bluetooth/BluetoothServerSocket.java
@@ -40,7 +40,7 @@ import java.io.IOException;
  * BluetoothSocket} ready for an outgoing connection to a remote
  * {@link BluetoothDevice}.
  *
- * <p>Use {@link BluetoothAdapter#listenUsingRfcommOn} to create a listening
+ * <p>Use {@link BluetoothAdapter#listenUsingRfcomm} to create a listening
  * {@link BluetoothServerSocket} ready for incoming connections to the local
  * {@link BluetoothAdapter}.
  *
diff --git a/core/java/android/bluetooth/BluetoothSocket.java b/core/java/android/bluetooth/BluetoothSocket.java
index 573cb3d..b9e33f3 100644
--- a/core/java/android/bluetooth/BluetoothSocket.java
+++ b/core/java/android/bluetooth/BluetoothSocket.java
@@ -42,7 +42,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
  * BluetoothSocket} ready for an outgoing connection to a remote
  * {@link BluetoothDevice}.
  *
- * <p>Use {@link BluetoothAdapter#listenUsingRfcommOn} to create a listening
+ * <p>Use {@link BluetoothAdapter#listenUsingRfcomm} to create a listening
  * {@link BluetoothServerSocket} ready for incoming connections to the local
  * {@link BluetoothAdapter}.
  *
diff --git a/core/java/android/pim/vcard/VCardComposer.java b/core/java/android/pim/vcard/VCardComposer.java
index 7b75f4a..c4711f8 100644
--- a/core/java/android/pim/vcard/VCardComposer.java
+++ b/core/java/android/pim/vcard/VCardComposer.java
@@ -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);
     }