commit 6227b441a0235b4acacd8eb937fe3d5b4a098c79
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 19 02:41:52 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 19 02:41:52 2018 +0000
tree e6430b00cc76c6375365075e6cddfaf0e0fd79e3
parent 843e387bb61744370f7fc4c6c13297e70a62c42a
parent 177156b57f5ccb5e5cfafc91b9ae80ce8f68e362

Merge "BluetoothManagerService: catch NoSuchElementException for unlinkToDeath"

services/core/java/com/android/server/BluetoothManagerService.java

diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index 49de4b15..555e899 100644
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -76,6 +76,7 @@
 import java.util.LinkedList;
 import java.util.Locale;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
@@ -1279,7 +1280,11 @@
             if (mService == null) {
                 return;
             }
-            mService.unlinkToDeath(this, 0);
+            try {
+                mService.unlinkToDeath(this, 0);
+            } catch (NoSuchElementException e) {
+                Log.e(TAG, "error unlinking to death", e);
+            }
             mService = null;
             mClassName = null;