commit 5d5751c78c0bbb9e1181783994f1fd1b5ee27d7c
author Min Zhou <zhoumin@oppo.corp-partner.google.com> Fri Apr 28 05:21:44 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 28 05:21:44 2023 +0000
tree a03199b1986b89d1a4da37c0e2480e7f60901393
parent ff8dea0da1b9a502eb6adc8259f94b0f87beb470
parent ed31be480d77c4e827ecc7ccb29615fa25750e96

[automerge] Catching IllegalStateException while device is going to shutdown 2p: b6a6fba3e7 am: ed31be480d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/22918469

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

service-t/src/com/android/server/net/NetworkStatsService.java

diff --git a/service-t/src/com/android/server/net/NetworkStatsService.java b/service-t/src/com/android/server/net/NetworkStatsService.java
index 961337d..c660792 100644
--- a/service-t/src/com/android/server/net/NetworkStatsService.java
+++ b/service-t/src/com/android/server/net/NetworkStatsService.java
@@ -946,7 +946,11 @@
     @GuardedBy("mStatsLock")
     private void shutdownLocked() {
         final TetheringManager tetheringManager = mContext.getSystemService(TetheringManager.class);
-        tetheringManager.unregisterTetheringEventCallback(mTetherListener);
+        try {
+            tetheringManager.unregisterTetheringEventCallback(mTetherListener);
+        } catch (IllegalStateException e) {
+            Log.i(TAG, "shutdownLocked: error when unregister tethering, ignored. e=" + e);
+        }
         mContext.unregisterReceiver(mPollReceiver);
         mContext.unregisterReceiver(mRemovedReceiver);
         mContext.unregisterReceiver(mUserReceiver);