From 178b028531db3a15866ff9dba6b875610f6ecbe3 Mon Sep 17 00:00:00 2001 From: Ajay Panicker Date: Tue, 28 Mar 2017 14:28:27 -0700 Subject: Bluetooth: Add additional BluetoothSocket logging to root cause errors Bug: 34780400 Test: Code still compiles Change-Id: I166842ecc6889f9ea403e7aa3678ed818cd80968 --- framework/java/android/bluetooth/BluetoothSocket.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'framework/java/android/bluetooth/BluetoothSocket.java') diff --git a/framework/java/android/bluetooth/BluetoothSocket.java b/framework/java/android/bluetooth/BluetoothSocket.java index 98a5341b30..6bf6aa0a9e 100644 --- a/framework/java/android/bluetooth/BluetoothSocket.java +++ b/framework/java/android/bluetooth/BluetoothSocket.java @@ -416,6 +416,11 @@ public final class BluetoothSocket implements Closeable { if(mSocketState != SocketState.INIT) return EBADFD; if(mPfd == null) return -1; FileDescriptor fd = mPfd.getFileDescriptor(); + if (fd == null) { + Log.e(TAG, "bindListen(), null file descriptor"); + return -1; + } + if (DBG) Log.d(TAG, "bindListen(), Create LocalSocket"); mSocket = LocalSocket.createConnectedLocalSocket(fd); if (DBG) Log.d(TAG, "bindListen(), new LocalSocket.getInputStream()"); @@ -556,8 +561,9 @@ public final class BluetoothSocket implements Closeable { @Override public void close() throws IOException { - if (DBG) Log.d(TAG, "close() in, this: " + this + ", channel: " + mPort + ", state: " - + mSocketState); + Log.d(TAG, "close() this: " + this + ", channel: " + mPort + + ", mSocketIS: " + mSocketIS + ", mSocketOS: " + mSocketOS + + "mSocket: " + mSocket + ", mSocketState: " + mSocketState); if(mSocketState == SocketState.CLOSED) return; else @@ -567,9 +573,6 @@ public final class BluetoothSocket implements Closeable { if(mSocketState == SocketState.CLOSED) return; mSocketState = SocketState.CLOSED; - if (DBG) Log.d(TAG, "close() this: " + this + ", channel: " + mPort + - ", mSocketIS: " + mSocketIS + ", mSocketOS: " + mSocketOS + - "mSocket: " + mSocket); if(mSocket != null) { if (DBG) Log.d(TAG, "Closing mSocket: " + mSocket); mSocket.shutdownInput(); -- cgit v1.2.3