summaryrefslogtreecommitdiff
path: root/telephony
diff options
context:
space:
mode:
author Aswin Sankar <apsankar@google.com> 2022-09-22 17:23:27 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-09-22 17:23:27 +0000
commitb3918d9c38e6dc49f5e0a56324de9b2bc0404fc7 (patch)
treefe5d18f55f4071c9ed02054049ee5cee239fae95 /telephony
parentc6662630ff1632f0d0ab1f8b3fb77ff344aecc0f (diff)
parent4041689bf39e6c5c4619d3bd1b3c43de2a02371c (diff)
Merge "NetworkService: quitSafely() on onDestroy()" into tm-qpr-dev
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/android/telephony/NetworkService.java2
-rw-r--r--telephony/java/android/telephony/data/DataService.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/NetworkService.java b/telephony/java/android/telephony/NetworkService.java
index c75de42707a6..ac892da765e7 100644
--- a/telephony/java/android/telephony/NetworkService.java
+++ b/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();
}
diff --git a/telephony/java/android/telephony/data/DataService.java b/telephony/java/android/telephony/data/DataService.java
index 700d61597d00..d8b2cbebdf28 100644
--- a/telephony/java/android/telephony/data/DataService.java
+++ b/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();
}