commit 92a429fc5c84ef5fca2bd20a014ccf7aeacdddb8
author Paul Hu <paulhu@google.com> Fri Apr 28 07:27:44 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 28 07:27:44 2023 +0000
tree 72cb085db5c45ce9faa9eb89970cf8fa805c7fb8
parent b6a6fba3e7a1e11d4295615ae1d9ee725675bb40
parent 9d9ae4d2a167e673087007f3b03307b2380a600c

Merge "Add MdnsServiceCache" into tm-mainline-prod

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