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

Commit 0c0ec9d2 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Android (Google) Code Review
Browse files

Merge "Prevent possible NullPointerException when service is destroyed" into lmp-mr1-dev

parents b23a4722 c2f4102e

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

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

    @Override

    public void onDestroy() {

    public void onDestroy() {

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

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

        mAdapterService.removeProfile(this);

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



        if (mCleaningUp) {

        if (mCleaningUp) {

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

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

        } else {

        } else {