Commit 28d9c2fe authored by scheib's avatar scheib Committed by Commit bot

bluetooth: Enable BluetoothAdapterFactory on android.

BUG=471536

Review URL: https://codereview.chromium.org/1130783004

Cr-Commit-Position: refs/heads/master@{#329755}
parent 9e16963e
...@@ -68,8 +68,7 @@ void BluetoothAdapterAndroid::SetName(const std::string& name, ...@@ -68,8 +68,7 @@ void BluetoothAdapterAndroid::SetName(const std::string& name,
} }
bool BluetoothAdapterAndroid::IsInitialized() const { bool BluetoothAdapterAndroid::IsInitialized() const {
NOTIMPLEMENTED(); return true;
return false;
} }
bool BluetoothAdapterAndroid::IsPresent() const { bool BluetoothAdapterAndroid::IsPresent() const {
...@@ -147,18 +146,21 @@ void BluetoothAdapterAndroid::AddDiscoverySession( ...@@ -147,18 +146,21 @@ void BluetoothAdapterAndroid::AddDiscoverySession(
BluetoothDiscoveryFilter* discovery_filter, BluetoothDiscoveryFilter* discovery_filter,
const base::Closure& callback, const base::Closure& callback,
const ErrorCallback& error_callback) { const ErrorCallback& error_callback) {
error_callback.Run();
} }
void BluetoothAdapterAndroid::RemoveDiscoverySession( void BluetoothAdapterAndroid::RemoveDiscoverySession(
BluetoothDiscoveryFilter* discovery_filter, BluetoothDiscoveryFilter* discovery_filter,
const base::Closure& callback, const base::Closure& callback,
const ErrorCallback& error_callback) { const ErrorCallback& error_callback) {
error_callback.Run();
} }
void BluetoothAdapterAndroid::SetDiscoveryFilter( void BluetoothAdapterAndroid::SetDiscoveryFilter(
scoped_ptr<BluetoothDiscoveryFilter> discovery_filter, scoped_ptr<BluetoothDiscoveryFilter> discovery_filter,
const base::Closure& callback, const base::Closure& callback,
const ErrorCallback& error_callback) { const ErrorCallback& error_callback) {
error_callback.Run();
} }
void BluetoothAdapterAndroid::RemovePairingDelegateInternal( void BluetoothAdapterAndroid::RemovePairingDelegateInternal(
......
...@@ -62,7 +62,7 @@ bool BluetoothAdapterFactory::IsBluetoothAdapterAvailable() { ...@@ -62,7 +62,7 @@ bool BluetoothAdapterFactory::IsBluetoothAdapterAvailable() {
// instance even on platforms that would otherwise not support it. // instance even on platforms that would otherwise not support it.
if (default_adapter.Get()) if (default_adapter.Get())
return true; return true;
#if defined(OS_CHROMEOS) || defined(OS_WIN) #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_WIN)
return true; return true;
#elif defined(OS_MACOSX) #elif defined(OS_MACOSX)
return base::mac::IsOSLionOrLater(); return base::mac::IsOSLionOrLater();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment