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

Commit 39729dc0 authored by Yiyi Shen's avatar Yiyi Shen Committed by Android (Google) Code Review
Browse files

Merge "Revert "Only unregister the callback when bt adapter is enabled"" into main

parents 525c946d 0d3b4156

packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothLeBroadcastAssistantCallbackExt.kt

+1 −6
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settingslib.bluetooth



import android.bluetooth.BluetoothAdapter

import android.bluetooth.BluetoothDevice

import android.bluetooth.BluetoothLeBroadcastAssistant

import android.bluetooth.BluetoothLeBroadcastMetadata
@@ -82,9 +81,5 @@ val LocalBluetoothLeBroadcastAssistant.onSourceConnectedOrRemoved: Flow<Unit> 
            ConcurrentUtils.DIRECT_EXECUTOR,

            callback,

        )

        awaitClose {

            if (BluetoothAdapter.getDefaultAdapter()?.isEnabled == true) {

                unregisterServiceCallBack(callback)

            }

        }

        awaitClose { unregisterServiceCallBack(callback) }

    }