972732 - Move BluetoothServiceBluedroid.{cpp,h} out from gonk folder and BluetoothDBusService.{cpp,h} from linux folder

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Bluetooth, defect)

Description

[Ben Tian (inactive)]

Move dom/bluetooth/bluedroid/gonk/BluetoothServiceBluedroid.{cpp,h}
to dom/bluetooth/bluedroid/BluetoothServiceBluedroid.{cpp,h}

Comment 1

[Ben Tian (inactive)]

Attachment: Patch 1 (v1): Move BluetoothServicerBluedroid.{cpp,h} out from gonk folder

Comment 2

[Thomas Zimmermann [:tzimmermann] [:tdz]]

With bug 969314 being fixed, should we do something similar for BlueZ?

Comment 3

[Ben Tian (inactive)]

Sure. We should move them out since only 1 messaging protocol (dbus) is supported right now. I'll prepare a new patch.

Comment 4

[Thomas Zimmermann [:tzimmermann] [:tdz]]

(In reply to Ben Tian [:btian] from comment #3)
> Sure. We should move them out since only 1 messaging protocol (dbus) is
> supported right now. I'll prepare a new patch.

Please make it depend on bug 972253. I don't want to redo these fixes because the file paths changed. ;)

Comment 5

[Ben Tian (inactive)]

Attachment: Patch 1 (v2): Move files out from bluez/linux and bluedroid/gonk

Also revise an OPP minor error. Will mark r? once bug 972253 is landed.

Comment 6

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Comment on attachment 8376101 [details] [diff] [review]
Patch 1 (v2): Move files out from bluez/linux and bluedroid/gonk

Let's mark this for a review.

Comment 7

[Eric Chou [:ericchou] [:echou]]

Comment on attachment 8376101 [details] [diff] [review]
Patch 1 (v2): Move files out from bluez/linux and bluedroid/gonk

Review of attachment 8376101 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks for reminding, Thomas. :)

::: dom/bluetooth/bluedroid/BluetoothOppManager.cpp
@@ +1463,5 @@
>    if (aSocket != mSocket) {
>      // Do nothing when a listening server socket is closed.
>      return;
>    }
> +  BT_LOGR("[%s]", (mIsServer) ? "server" : "client");

Good catch. ;)

Comment 8

[Ben Tian (inactive)]

Attachment: [final] Patch 1/2: Move files out from bluez/linux and bluedroid/gonk, r=echou

Comment 9

[Ben Tian (inactive)]

Attachment: Patch 2/2: clobber change for moving file location

Comment 10

[Ben Tian (inactive)]

try: https://tbpl.mozilla.org/?tree=Try&rev=32d5681d4a79

Comment 11

[Ben Tian (inactive)]

https://hg.mozilla.org/integration/b2g-inbound/rev/edccc6d303af
https://hg.mozilla.org/integration/b2g-inbound/rev/24881928d5da

Comment 12

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/edccc6d303af
https://hg.mozilla.org/mozilla-central/rev/24881928d5da