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

Commit 0ad887b3 authored by Pavlin Radoslavov's avatar Pavlin Radoslavov Committed by android-build-merger
Browse files

Merge "Add missing "try ... finally" safeguards" into nyc-dev 

am: 0810732a2a

* commit '0810732a2affee7264d12b73fbcfa82d0db991b4':
  Add missing "try ... finally" safeguards

Change-Id: I29408abab67992b5d33684254c1d7ea7abf34e33
parents d2a697f1 630c0a3a

framework/java/android/bluetooth/BluetoothAdapter.java

+9 −6
Original line number Diff line number Diff line
@@ -2045,12 +2045,15 @@ public final class BluetoothAdapter { 
            public void onBluetoothServiceDown() {

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



                try {

                    mServiceLock.writeLock().lock();

                    mService = null;

                    if (mLeScanClients != null) mLeScanClients.clear();

                    if (sBluetoothLeAdvertiser != null) sBluetoothLeAdvertiser.cleanup();

                    if (sBluetoothLeScanner != null) sBluetoothLeScanner.cleanup();

                } finally {

                    mServiceLock.writeLock().unlock();

                }



                synchronized (mProxyServiceStateCallbacks) {

                    for (IBluetoothManagerCallback cb : mProxyServiceStateCallbacks ){

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+20 −14
Original line number Diff line number Diff line
@@ -1457,6 +1457,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                                                    BluetoothAdapter.STATE_OFF);

                        sendBluetoothServiceDownCallback();



                        try {

                            mBluetoothLock.writeLock().lock();

                            if (mBluetooth != null) {

                                mBluetooth = null;
@@ -1464,7 +1465,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                                mContext.unbindService(mConnection);

                            }

                            mBluetoothGatt = null;

                        } finally {

                            mBluetoothLock.writeLock().unlock();

                        }



                        SystemClock.sleep(100);
@@ -1765,6 +1768,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 


        sendBluetoothServiceDownCallback();



        try {

            mBluetoothLock.writeLock().lock();

            if (mBluetooth != null) {

                mBluetooth = null;
@@ -1772,7 +1776,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                mContext.unbindService(mConnection);

            }

            mBluetoothGatt = null;

        } finally {

            mBluetoothLock.writeLock().unlock();

        }



        mHandler.removeMessages(MESSAGE_BLUETOOTH_STATE_CHANGE);

        mState = BluetoothAdapter.STATE_OFF;