summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Aswin Sankar <apsankar@google.com> 2022-09-22 06:27:47 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-22 06:27:47 +0000
commitc05a3c6af478a602c67fe85a71f67662cc9329a0 (patch)
tree5db0932e907a87e17e85664c62be5a19f9090770
parentad5979611a568f71f00f9402774bca071251750e (diff)
parent2b1ee201ef9c100387a90941244ea48d0455fa96 (diff)
Merge "NetworkService: quitSafely() on onDestroy()" am: 2b1ee201ef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2214372 Change-Id: I83411e9c933bd3739e96caa9b44b78799bb7ba69 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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();
}