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

Commit 2a4348b8 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "Ensure BluetoothSocket closed even when exception happens" am: d163ac53 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2465074



Change-Id: I50430ab5dd91dcc45bb3e21f3957007eb02c422a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 173824aa d163ac53

android/app/src/com/android/bluetooth/pbapclient/PbapClientConnectionHandler.java

+3 −3
Original line number Diff line number Diff line
@@ -229,13 +229,13 @@ class PbapClientConnectionHandler extends Handler { 
                        mObexSession.disconnect(null);

                        mObexSession.close();

                    }



                } catch (IOException e) {

                    Log.w(TAG, "DISCONNECT Failure ", e);

                } finally {

                    if (DBG) {

                        Log.d(TAG, "Closing Socket");

                    }

                    closeSocket();

                } catch (IOException e) {

                    Log.w(TAG, "DISCONNECT Failure ", e);

                }

                if (DBG) {

                    Log.d(TAG, "Completing Disconnect");