Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "BluetoothManagerService: catch NoSuchElementException for unlinkToDeath"

Browse Source
This commit is contained in:
Treehugger Robot
2018-12-19 02:41:52 +00:00
committed by Gerrit Code Review
parent 843e387bb6 177156b57f
commit 6227b441a0
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/BluetoothManagerService.java
View File

@@ -76,6 +76,7 @@ import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.NoSuchElementException;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -1279,7 +1280,11 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
if (mService == null) { if (mService == null) {
return; return;
} }
mService.unlinkToDeath(this, 0); try {
mService.unlinkToDeath(this, 0);
} catch (NoSuchElementException e) {
Log.e(TAG, "error unlinking to death", e);
}
mService = null; mService = null;
mClassName = null; mClassName = null;