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

Commit 5bb74cb2 authored by Wei Wang's avatar Wei Wang Committed by Android Git Automerger
Browse files

am 212d05cd: am e5029e78: Add protection before cleaning up adv and scan manager. 

* commit '212d05cd':
  Add protection before cleaning up adv and scan manager.
parents ca9d752d 212d05cd

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

+4 −4
Original line number Diff line number Diff line
@@ -187,16 +187,16 @@ public class GattService extends ProfileService { 
        mHandleMap.clear();

        mServiceDeclarations.clear();

        mReliableQueue.clear();

        mAdvertiseManager.cleanup();

        mScanManager.cleanup();

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

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

        return true;

    }



    protected boolean cleanup() {

        if (DBG) Log.d(TAG, "cleanup()");

        cleanupNative();

        mAdvertiseManager.cleanup();

        mScanManager.cleanup();

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

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

        return true;

    }