am 8a4dfb9c: am a3d5b688: Merge "Add serial port profile support and allow to connect to rfcomm channel without sdp discovery" into jb-mr1-dev

* commit '8a4dfb9ce89311a5e7744730f0277123b947ad6b':
  Add serial port profile support and allow to connect to rfcomm channel without sdp discovery

core/java/android/bluetooth/BluetoothSocket.java

@@ -19,6 +19,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;
+import java.util.UUID;
 import android.net.LocalSocket;
 import java.nio.ByteOrder;
 import java.nio.ByteBuffer;
@@ -140,7 +141,9 @@ public final class BluetoothSocket implements Closeable {
                 throw new IOException("Invalid RFCOMM channel: " + port);
             }
         }
-        mUuid = uuid;
+        if(uuid != null)
+            mUuid = uuid;
+        else mUuid = new ParcelUuid(new UUID(0, 0));
         mType = type;
         mAuth = auth;
         mEncrypt = encrypt;