Merge "BluetoothManagerService: catch NoSuchElementException for unlinkToDeath" am: 6227b441a0 (4e0b70bd) · Commits · e / os / android_frameworks_base

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -76,6 +76,7 @@ import java.util.HashMap;
		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 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		if (mService == null) {
		return;
		}
		try {
		mService.unlinkToDeath(this, 0);
		} catch (NoSuchElementException e) {
		Log.e(TAG, "error unlinking to death", e);
		}
		mService = null;
		mClassName = null;