commit ed31be480d77c4e827ecc7ccb29615fa25750e96
author Min Zhou <zhoumin@oppo.corp-partner.google.com> Fri Apr 28 02:07:23 2023 +0000
committer Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> Fri Apr 28 02:07:23 2023 +0000
tree a03199b1986b89d1a4da37c0e2480e7f60901393
parent 2ac29be17b2166c965b1c33d2b199a9ae13ff4ca
parent b6a6fba3e7a1e11d4295615ae1d9ee725675bb40

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

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

Bug: 273459595
Change-Id: I68263dbc09b8d6f35d0c04baf503e8a884a69ad0
Merged-In: Ib87901775668caf10108ece0f78da738a6fe2692

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);