Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c1f3030 authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

am 3b5c4382: am b8e80eb5: am 4fd38e8d: Merge "Clean up debug messages" into jb-mr1.1-dev 

* commit '3b5c43825eaf8096c01eac77e03a8aac8e9fab4a':
  Clean up debug messages
parents 82c04924 a466c6c7

framework/java/android/bluetooth/BluetoothAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -1212,7 +1212,7 @@ public final class BluetoothAdapter { 
    final private IBluetoothManagerCallback mManagerCallback =

        new IBluetoothManagerCallback.Stub() {

            public void onBluetoothServiceUp(IBluetooth bluetoothService) {

                if (DBG) Log.d(TAG, "onBluetoothServiceUp: " + bluetoothService);

                if (VDBG) Log.d(TAG, "onBluetoothServiceUp: " + bluetoothService);

                synchronized (mManagerCallback) {

                    mService = bluetoothService;

                    for (IBluetoothManagerCallback cb : mProxyServiceStateCallbacks ){
@@ -1228,7 +1228,7 @@ public final class BluetoothAdapter { 
            }



            public void onBluetoothServiceDown() {

                if (DBG) Log.d(TAG, "onBluetoothServiceDown: " + mService);

                if (VDBG) Log.d(TAG, "onBluetoothServiceDown: " + mService);

                synchronized (mManagerCallback) {

                    mService = null;

                    for (IBluetoothManagerCallback cb : mProxyServiceStateCallbacks ){

framework/java/android/bluetooth/BluetoothSocket.java

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ public final class BluetoothSocket implements Closeable { 


    @Override

    public void close() throws IOException {

        Log.d(TAG, "close() in, this: " + this + ", channel: " + mPort + ", state: " + mSocketState);

        if (VDBG) Log.d(TAG, "close() in, this: " + this + ", channel: " + mPort + ", state: " + mSocketState);

        if(mSocketState == SocketState.CLOSED)

            return;

        else