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

Commit ab361100 authored by Aswin Sankar's avatar Aswin Sankar Committed by Automerger Merge Worker
Browse files

Merge "NetworkService: quitSafely() on onDestroy()" am: 2b1ee201 am: c05a3c6a am: a9e715b9 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2214372



Change-Id: I49993f1669d989e9e00bdc1d2a38e4dc5b59fcff
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0ee8f48 a9e715b9

telephony/java/android/telephony/NetworkService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -265,7 +265,7 @@ public abstract class NetworkService extends Service { 
    /** @hide */

    /** @hide */

    @Override

    @Override

    public void onDestroy() {

    public void onDestroy() {

        mHandlerThread.quit();

        mHandlerThread.quitSafely();

        super.onDestroy();

        super.onDestroy();

    }

    }

telephony/java/android/telephony/data/DataService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -725,7 +725,7 @@ public abstract class DataService extends Service { 




    @Override

    @Override

    public void onDestroy() {

    public void onDestroy() {

        mHandlerThread.quit();

        mHandlerThread.quitSafely();

        super.onDestroy();

        super.onDestroy();

    }

    }