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

Commit 9b7150e8 authored by Matadeen Mishra's avatar Matadeen Mishra Committed by android-build-merger
Browse files

Merge "GATT: Fix FD leak caused by GATT profile" am: 5de27cf7 

am: 1ab1fd99

* commit '1ab1fd99':
  GATT: Fix FD leak caused by GATT profile

Change-Id: I71bb1fb45e1411f99c679fa78a86fe6adda563d1
parents 30cb4445 1ab1fd99

android/app/src/com/android/bluetooth/gatt/AdvertiseManager.java

+10 −0
Original line number Diff line number Diff line
@@ -89,6 +89,16 @@ class AdvertiseManager { 
    void cleanup() {

        logd("advertise clients cleared");

        mAdvertiseClients.clear();



        if (mHandler != null) {

            // Shut down the thread

            mHandler.removeCallbacksAndMessages(null);

            Looper looper = mHandler.getLooper();

            if (looper != null) {

                looper.quit();

            }

            mHandler = null;

        }

    }



    /**

android/app/src/com/android/bluetooth/gatt/ScanManager.java

+10 −0
Original line number Diff line number Diff line
@@ -113,6 +113,16 @@ public class ScanManager { 
        mRegularScanClients.clear();

        mBatchClients.clear();

        mScanNative.cleanup();



        if (mHandler != null) {

            // Shut down the thread

            mHandler.removeCallbacksAndMessages(null);

            Looper looper = mHandler.getLooper();

            if (looper != null) {

                looper.quit();

            }

            mHandler = null;

        }

    }



    /**