Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 798035 - Patch 2: Bluetooth SCOManager Cleanup; r=gyeh

Browse Source 
--HG--
extra : rebase_source : 4509998c8d685cf510861ebc06616387dca6444f
This commit is contained in:
Kyle Machulis 2012-10-05 19:16:43 -07:00
parent ce91963373
commit 5ee8209316
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dom/bluetooth/BluetoothScoManager.cpp
View File

@ -57,7 +57,6 @@ namespace {
StaticRefPtr<BluetoothScoManager> gBluetoothScoManager;
StaticAutoPtr<BluetoothScoManagerObserver> sScoObserver;
bool gInShutdown = false;
static nsCOMPtr<nsIThread> sScoCommandThread;
} // anonymous namespace
NS_IMETHODIMP
@ -82,12 +81,6 @@ BluetoothScoManager::BluetoothScoManager()
bool
BluetoothScoManager::Init()
{
if (!sScoCommandThread &&
NS_FAILED(NS_NewThread(getter_AddRefs(sScoCommandThread)))) {
NS_ERROR("Failed to new thread for sScoCommandThread");
return false;
}
sScoObserver = new BluetoothScoManagerObserver();
return true;
}
@ -100,14 +93,6 @@ BluetoothScoManager::~BluetoothScoManager()
void
BluetoothScoManager::Cleanup()
{
// Shut down the command thread if it still exists.
if (sScoCommandThread) {
nsCOMPtr<nsIThread> thread;
sScoCommandThread.swap(thread);
if (NS_FAILED(thread->Shutdown())) {
NS_WARNING("Failed to shut down the bluetooth hfpmanager command thread!");
}
}
sScoObserver = nullptr;
}
@ -117,11 +102,6 @@ BluetoothScoManager::Get()
{
MOZ_ASSERT(NS_IsMainThread());
// If we already exist, exit early
if (!gBluetoothScoManager) {
return gBluetoothScoManager;
}
// If we already exist, exit early
if (gBluetoothScoManager) {
return gBluetoothScoManager;