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

Commit b8997ce7 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Android Git Automerger
Browse files

am 561f8821: Merge "Prevent possible NullPointerException when service is... 

am 561f8821: Merge "Prevent possible NullPointerException when service is destroyed" into lmp-mr1-dev

* commit '561f8821':
  Prevent possible NullPointerException when service is destroyed
parents 64c4e01e 561f8821

src/com/android/bluetooth/btservice/ProfileService.java

+2 −1
Original line number Diff line number Diff line
@@ -174,7 +174,8 @@ public abstract class ProfileService extends Service { 
    @Override

    public void onDestroy() {

        if (DBG) log("Destroying service.");

        mAdapterService.removeProfile(this);

        if (mAdapterService != null) mAdapterService.removeProfile(this);



        if (mCleaningUp) {

            if (DBG) log("Cleanup already started... Skipping cleanup()...");

        } else {