diff options
| author | 2022-09-22 09:18:41 +0000 | |
|---|---|---|
| committer | 2022-09-22 09:18:41 +0000 | |
| commit | f4a2305248388c975f1a4a0d324e3e5fb1d24e8c (patch) | |
| tree | b8a718b6ff5deddd964b86f319b774af3e94302c /telephony | |
| parent | 35c994e6a4ebeac0c8ba823e1d2ce26642e65f45 (diff) | |
| parent | ab3611005116be0921bff1194055ad743386a689 (diff) | |
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>
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/NetworkService.java | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/data/DataService.java | 2 |
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(); } |