Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a92dd340 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5198681 from 1b598f4fb51010767c8660597ea87b2b916f9307 to qt-release

Change-Id: Ia51eefb194816d0a246499e7cbb9d4dce4de0114
parents 3bc4b087 9cf8a60b
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -67,8 +67,10 @@ public final class BluetoothManager {
        }
        // Legacy api - getDefaultAdapter does not take in the context
        mAdapter = BluetoothAdapter.getDefaultAdapter();
        if (mAdapter != null) {
            mAdapter.setContext(context);
        }
    }

    /**
     * Get the default BLUETOOTH Adapter for this device.
+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;

@@ -1276,7 +1277,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;