bb351c1c6ca218d9364a89a4370b2b6f5ab8efa9: Merge mozilla-central to b2g-inbound
Carsten "Tomcat" Book <cbook@mozilla.com> - Thu, 21 Jan 2016 12:30:56 +0100 - rev 303239
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Merge mozilla-central to b2g-inbound
448d520ede2561258655d71a697d29cc0a7c83fa: Bug 1239979: Get pointers to Bluetooth managers during each shutdown, r=shuang
Thomas Zimmermann <tdz@users.sourceforge.net> - Thu, 21 Jan 2016 12:30:00 +0100 - rev 303238
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Bug 1239979: Get pointers to Bluetooth managers during each shutdown, r=shuang |BluetoothServiceBluedroid::StopInternal| stores pointers to Bluetooth managers in a static array. This is only filled on the first call, but pointers change when re-enabling Bluetooth. This patch changes the code to use a non-static array, so pointers to Bluetooth managers are looked-up on each call to the method.
7be5a7820a661278dbb8d114a71e26788cd9eb58: Bug 1239979: Cleanup |BluetoothSocket|'s internals when connections close, r=btian
Thomas Zimmermann <tdz@users.sourceforge.net> - Thu, 21 Jan 2016 12:30:00 +0100 - rev 303237
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Bug 1239979: Cleanup |BluetoothSocket|'s internals when connections close, r=btian With this patch, |BluetoothSocket| cleans up its internal state whenever a connection gets closed, either intentionally or from an error. The socket can then be reused for a new connection. If we try to destruct an open Bluetooth socket, we'd probably leak the file descriptor or transition into an undefined state. The destructor now asserts that the socket is closed.
bbdedc47cf6f8c55c3adfa5cf69372a4f2cc1e9d: Bug 1239979: Store pointer to Bluetooth socket interface in |BluetoothSocket|, r=btian
Thomas Zimmermann <tdz@users.sourceforge.net> - Thu, 21 Jan 2016 12:30:00 +0100 - rev 303236
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Bug 1239979: Store pointer to Bluetooth socket interface in |BluetoothSocket|, r=btian |BluetoothSocket| currently stores the pointer to the socket interface in a global static location. This pointer can become invalid if the Bluetooth module get's disabled. Enabling Bluetooth again and calling the socket interface would execute on undefined state. The current implementation of the Bluedroid backend keeps the interface pointers valid, so this problem doesn't happen in practice. It's still a bug, though. This patch changes |BluetoothSocket| to store the socket-interface pointer internally. So it will acquire a new pointer for each socket.
cdf8c7c78c8b204f157999cba0421cf664f24061: Bug 1239979: Add |BluetoothSocket::Accept| method, r=btian
Thomas Zimmermann <tdz@users.sourceforge.net> - Thu, 21 Jan 2016 12:30:00 +0100 - rev 303235
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Bug 1239979: Add |BluetoothSocket::Accept| method, r=btian The new method |Accept| of |BluetoothSocket| encapsulates the code for accepting from a passive socket. Having this method will allow for storing the socket interface in |BluetoothSocket| itself.
f632ea7d8d41e4948c784d775fde517cbbda9084: Bug 1239979: Close sockets when deinitializing Bluetooth profile managers, r=btian
Thomas Zimmermann <tdz@users.sourceforge.net> - Thu, 21 Jan 2016 12:30:00 +0100 - rev 303234
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Bug 1239979: Close sockets when deinitializing Bluetooth profile managers, r=btian
c08aaa73c679f1bb4c1829a478769c4f5c92477c: Bug 1239979: Uninitialized Bluetooth profile managers explictly to release refs, r=shuang
Thomas Zimmermann <tdz@users.sourceforge.net> - Thu, 21 Jan 2016 12:30:00 +0100 - rev 303233
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Bug 1239979: Uninitialized Bluetooth profile managers explictly to release refs, r=shuang The current Bluetooth profile managers remove themselves from a number of observer lists in their destructors. But |nsIObserverService| keeps it's own reference to the managers, so the destructors never run. Con- sequently the Bluetooth module nevers cleans up correctly. This patch adds an explicit uninit method to each profile manager. It removes the manager from the observer lists.
541f217c62dbee344a63e28f869ed5e179f223fd: Bug 1239979: Init and uninit all Bluetooth profile managers, r=shuang
Thomas Zimmermann <tdz@users.sourceforge.net> - Thu, 21 Jan 2016 12:30:00 +0100 - rev 303232
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Bug 1239979: Init and uninit all Bluetooth profile managers, r=shuang The use is init and deinit methods is currently inconsistent among Bluetooth profile managers. This patch unifies all these methods and integrates them into the Bluetooth service. Instances of the manager classes are now unref'ed during Bluetooth shutdown.
77c14ffaf5f83e7f5fdd23d446c5feb4dea2a852: Bumping manifests a=b2g-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Thu, 21 Jan 2016 03:05:53 -0800 - rev 303231
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Bumping manifests a=b2g-bump
3e8be31923a01fed15555f58db0046b315f9ed80: Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Thu, 21 Jan 2016 03:04:17 -0800 - rev 303230
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4d388b4c8341 Author: Ricky Chien <rickychien@users.noreply.github.com> Desc: Merge pull request #33910 from rickychien/r-wrapper-to-nodejs Bug 1131521 - Running r-wrapper.js on node.js r=@scottwu ======== https://hg.mozilla.org/integration/gaia-central/rev/9f732e7d504b Author: Ricky Chien <ricky060709@gmail.com> Desc: Bug 1131521 - Running r-wrapper.js on node.js
d5df97e337b5b827f047986d0e3b0c51ee6386b8: Bumping manifests a=b2g-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Thu, 21 Jan 2016 01:54:02 -0800 - rev 303229
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Bumping manifests a=b2g-bump
1f855bd3c4777a519f9562c366e0d63d57e2a0e5: Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Thu, 21 Jan 2016 01:52:28 -0800 - rev 303228
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/6c15bf65a1be Author: gasolin <gasolin@gmail.com> Desc: Merge pull request #33929 from gasolin/issue-1236781 Bug 1236781 - move 'Connect with WPS' to Advanced settings section, r=scott ======== https://hg.mozilla.org/integration/gaia-central/rev/b315b7e917f3 Author: gasolin <gasolin@gmail.com> Desc: Bug 1236781 - move 'Connect with WPS' to Advanced settings section, r=scott
3587e74b6c036c96f015c2ae2e54f8304b01af0f: Bumping manifests a=b2g-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Thu, 21 Jan 2016 01:17:04 -0800 - rev 303227
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Bumping manifests a=b2g-bump
4d26204d0103d1eb258845d98119d48509cbddbd: Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Thu, 21 Jan 2016 01:15:29 -0800 - rev 303226
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8dd58c096d55 Author: Carsten Book <tomcat@mozilla.com> Desc: Merge pull request #33867 from vinay-y/bug1206474 Bug 1206474 - Fixed errors causing Bug 1238482. r=salva ======== https://hg.mozilla.org/integration/gaia-central/rev/e0ba718fdf05 Author: Vinay <vinayy765@gmail.com> Desc: Bug 1206474 - Combining older and new patches ======== https://hg.mozilla.org/integration/gaia-central/rev/ab2109968067 Author: Vinay <vinayy765@gmail.com> Desc: Bug 1206474 - Fixed errors causing Bug 1238482 ======== https://hg.mozilla.org/integration/gaia-central/rev/622dff91134a Author: Vinay <vinayy765@gmail.com> Desc: Bug 1206474 - Updated files causing Bug 1238482
cb11faf761e65ca22104470306d3cbf813d1344e: Bug 1235484 - Part 2: Refine testcases and control radio with connection. r=bevistseng
stone <stone123456@gmail.com> - Wed, 20 Jan 2016 11:39:23 +0800 - rev 303225
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Bug 1235484 - Part 2: Refine testcases and control radio with connection. r=bevistseng
8e85a88ddba0990cc87f44d7e8e4c2832c58ec95: Bug 1235484 - Part 1: Refine radio state check in MmsService. r=bevistseng
stone <stone123456@gmail.com> - Wed, 20 Jan 2016 11:39:06 +0800 - rev 303224
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Bug 1235484 - Part 1: Refine radio state check in MmsService. r=bevistseng
cea2883034cbb4485c1ee0047cd6a7cfe4b9b652: Backed out 2 changesets (bug 1240201) for Windows wpt bustage a=merge
Wes Kocher <wkocher@mozilla.com> - Thu, 21 Jan 2016 12:28:24 -0800 - rev 303223
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Backed out 2 changesets (bug 1240201) for Windows wpt bustage a=merge Backed out changeset b06a049cafb7 (bug 1240201) Backed out changeset 69b695ad6d43 (bug 1240201)
d55b4c5e8a862a79ed4aeb1c14f7d47844354847: Backed out changeset 18e7baac03ce (bug 1241062) for windows wpt bustage a=merge
Wes Kocher <wkocher@mozilla.com> - Thu, 21 Jan 2016 12:28:39 -0800 - rev 303222
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Backed out changeset 18e7baac03ce (bug 1241062) for windows wpt bustage a=merge
7f3168c2fb0a71dfbd787965b686e91509ca42d9: Backout bug 1240916 because the update from upstream seems to be broken a=merge
Ehsan Akhgari <ehsan@mozilla.com> - Thu, 21 Jan 2016 13:17:13 -0500 - rev 303221
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Backout bug 1240916 because the update from upstream seems to be broken a=merge This is probably caused by https://github.com/kevina/wordlist/issues/144.
8a72770299f19f93f281874098ac8e94c76c8265: Merge inbound to m-c a=merge
Wes Kocher <wkocher@mozilla.com> - Thu, 21 Jan 2016 16:24:42 -0800 - rev 303220
Push 8978 by raliiev@mozilla.com at Mon, 25 Jan 2016 14:05:32 +0000
Merge inbound to m-c a=merge
(0) -300000 -100000 -30000 -10000 -3000 -1000 -300 -100 -50 -20 +20 +50 +100 +300 +1000 +3000 +10000 +30000 tip