Merge "NetworkService: quitSafely() on onDestroy()" am: 2b1ee201ef am: c05a3c6af4 am: a9e715b9e1 am: ab36110051

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

Change-Id: I3eb33e1c66510ecdfb166831413596a6ae1d3a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

telephony/java/android/telephony/NetworkService.java

@@ -265,7 +265,7 @@ public abstract class NetworkService extends Service {
     /** @hide */
     @Override
     public void onDestroy() {
-        mHandlerThread.quit();
+        mHandlerThread.quitSafely();
         super.onDestroy();
     }
 

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

@@ -725,7 +725,7 @@ public abstract class DataService extends Service {
 
     @Override
     public void onDestroy() {
-        mHandlerThread.quit();
+        mHandlerThread.quitSafely();
         super.onDestroy();
     }