Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1378)

Unified Diff: device/bluetooth/bluetooth_adapter_android.cc

Issue 1130783004: bluetooth: Enable BluetoothAdapterFactory on android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bta-ut-permission-
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | device/bluetooth/bluetooth_adapter_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_adapter_android.cc
diff --git a/device/bluetooth/bluetooth_adapter_android.cc b/device/bluetooth/bluetooth_adapter_android.cc
index 0b8bea30de428369c8bd34823eaa8acef26e85bd..007136d8c8d61734113e5e2bf0e561d49e113012 100644
--- a/device/bluetooth/bluetooth_adapter_android.cc
+++ b/device/bluetooth/bluetooth_adapter_android.cc
@@ -68,8 +68,7 @@ void BluetoothAdapterAndroid::SetName(const std::string& name,
}
bool BluetoothAdapterAndroid::IsInitialized() const {
- NOTIMPLEMENTED();
- return false;
+ return true;
}
bool BluetoothAdapterAndroid::IsPresent() const {
@@ -147,18 +146,21 @@ void BluetoothAdapterAndroid::AddDiscoverySession(
BluetoothDiscoveryFilter* discovery_filter,
const base::Closure& callback,
const ErrorCallback& error_callback) {
armansito 2015/05/12 22:39:33 Would it make sense to add NOTIMPLEMENTED() to the
scheib 2015/05/13 22:54:03 No, as they are actually called (and the error han
+ error_callback.Run();
}
void BluetoothAdapterAndroid::RemoveDiscoverySession(
BluetoothDiscoveryFilter* discovery_filter,
const base::Closure& callback,
const ErrorCallback& error_callback) {
+ error_callback.Run();
}
void BluetoothAdapterAndroid::SetDiscoveryFilter(
scoped_ptr<BluetoothDiscoveryFilter> discovery_filter,
const base::Closure& callback,
const ErrorCallback& error_callback) {
+ error_callback.Run();
}
void BluetoothAdapterAndroid::RemovePairingDelegateInternal(
« no previous file with comments | « no previous file | device/bluetooth/bluetooth_adapter_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698