Commit Graph

241685 Commits

Author SHA1 Message Date
Thomas Zimmermann
d0ba7dbf25 Bug 1159709: Cleanup inherited methods of |StreamSocket|, r=kmachulis
This patch cleans up the inherited methods of |StreamSocket|. Methods
of the same base class are grouped within the file, and each method
is labeled with 'override'.
2015-04-30 12:55:37 +02:00
Thomas Zimmermann
58b3a1e994 Bug 1159709: Integrate |ConnectionOrientedSocket| into socket I/O class hierarchy, r=kmachulis
This patch integrates |ConnectionOrientedSocket| into the hierarchy
of socket I/O classes. In future patches, the class can provide
common interfaces and functionality for all connection-oriented
sockets.
2015-04-30 12:55:37 +02:00
Thomas Zimmermann
a1f27cda16 Bug 1159709: Inherit |BluetoothDaemonConnection| from |DataSocket|, r=kmachulis
|BluetoothDaemonConnection| sends and receives data. With this patch
it inherits from |DataSocket|, which provides the respective abstract
interfaces.
2015-04-30 12:55:37 +02:00
B2G Bumper Bot
415749fdea Bumping manifests a=b2g-bump 2015-04-30 03:39:48 -07:00
B2G Bumper Bot
a6ddd7e8ea Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2033ce6ff069
Author: Luke Chang <lchang@mozilla.com>
Desc: Merge pull request #29793 from luke-chang/1156647_multi_screen_settings

Bug 1156647 - Add multi-screen item to the developer menu in settings, r=arthurcc

========

https://hg.mozilla.org/integration/gaia-central/rev/69158b1649bd
Author: Luke Chang <lchang@mozilla.com>
Desc: Bug 1156647 - Add multi-screen item to the developer menu in settings

========

https://hg.mozilla.org/integration/gaia-central/rev/eb4f28303be3
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #29738 from albertopq/1157157-ftu-button-truncated2

Bug 1157157 - Using 2 lines on FTU FB import messages r=sfoster

========

https://hg.mozilla.org/integration/gaia-central/rev/5f3cb6205da5
Author: albertopq <albert.pastor@gmail.com>
Desc: Bug 1157157 - Using 2 lines on FTU FB import messages
2015-04-30 03:37:36 -07:00
B2G Bumper Bot
681efdedb9 Bumping manifests a=b2g-bump 2015-04-30 02:52:29 -07:00
B2G Bumper Bot
4fe68c89ae Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/08e36898e3e6
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #29764 from arcturus/bug-1156468

Bug 1156468 - [Contacts][Merge Duplicates] Duplicate elements do not dis...

========

https://hg.mozilla.org/integration/gaia-central/rev/1e3c00227168
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Bug 1156468 - [Contacts][Merge Duplicates] Duplicate elements do not display on the Contact Detail pop-up r=gandalf
2015-04-30 02:50:18 -07:00
Thomas Zimmermann
680ee86ba7 Bug 1158818: Only store Bluetooth result runnable after command has been sent successfully, r=shuang
With the current code, the Bluetooth result runnable is saved for
receiving before a command has been sent successfully. If sending
fails afterwards, the saved result runnable will still sit in the
result queue, and interfere with later, successful commands.

With this patch, the result runnable is saved only if the sending
was successful.
2015-04-30 11:29:25 +02:00
B2G Bumper Bot
2c410ae4d1 Bumping manifests a=b2g-bump 2015-04-30 02:27:34 -07:00
B2G Bumper Bot
ae33eaf296 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0fd4920379e6
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #29796 from arcturus/bug-1157167

Bug 1157167 - [Flame][Contacts]ICE contacts icon will disappear in conta...

========

https://hg.mozilla.org/integration/gaia-central/rev/672e9b2a5900
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Bug 1157167 - [Flame][Contacts]ICE contacts icon will disappear in contacts list page after user sets "Order by last name". r=ferjm
2015-04-30 02:25:21 -07:00
Thomas Zimmermann
9d654e96e7 Bug 1159209: Remove template parameters from |DataSocketIO|, r=kmachulis
This patch removes the template parameters from |DataSocketIO| and
moves its methods into the C++ source file. All users have been
adapted.
2015-04-29 11:19:28 +02:00
Thomas Zimmermann
97a6e261a2 Bug 1159209: Remove template parameters from |SocketIOShutdownTask|, r=kmachulis
This patch removes the template parameters from |SocketIOShutdownTask|
and moves its methods into the C++ source file. All users have been
adapted.
2015-04-29 11:19:28 +02:00
Thomas Zimmermann
e65ee9545e Bug 1159209: Remove template parameters from |SocketIODeleteInstanceRunnable|, r=kmachulis
This patch removes the template parameters from
|SocketIODeleteInstanceRunnable| and moves its methods into the
C++ source file. All users have been adapted.
2015-04-29 11:19:28 +02:00
Thomas Zimmermann
108688d07a Bug 1159209: Remove template parameters from |SocketIORequestClosingRunnable|, r=kmachulis
This patch removes the template parameters from
|SocketIORequestClosingRunnable| and moves its methods into
the C++ source file. All users have been adapted.
2015-04-29 11:19:28 +02:00
Thomas Zimmermann
3e99239e23 Bug 1159209: Remove template parameters from |SocketIOEventRunnable|, r=kmachulis
This patch removes the template parameters from |SocketIOEventRunnable|
and moves its methods into the C++ source file. All users have been
adapted.
2015-04-29 11:19:28 +02:00
Ben Tian
1f25ec0b52 Bug 1158081 - Patch (2/2): Simplify |BluetoothOppManager::SendObexData| function, r=tzimmermann 2015-04-28 11:12:35 +08:00
Ben Tian
fcbc137d58 Bug 1158081 - Patch (1/2): Define macro to declare SocketObserver functions, r=tzimmermann 2015-04-28 11:12:13 +08:00
B2G Bumper Bot
67a9c84944 Bumping manifests a=b2g-bump 2015-04-30 00:04:48 -07:00
B2G Bumper Bot
fe2d31f1ff Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1859bb411945
Author: Evan Tseng <itoyxd@gmail.com>
Desc: Merge pull request #29737 from evanxd/bug-1158716

Bug 1158716 - Rename AudioChannelManager as AudioChannelService r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/e3f9859f6f3e
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 1158716 - Rename AudioChannelManager as AudioChannelService r=alive
2015-04-30 00:02:36 -07:00
B2G Bumper Bot
5c441474ea Bumping manifests a=b2g-bump 2015-04-29 23:47:35 -07:00
B2G Bumper Bot
dc432c0bde Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7f214563e373
Author: EragonJ (E.J.) <eragonj@eragonj.me>
Desc: Merge pull request #28974 from EragonJ/bug-1145055

Bug 1145055 - [Settings] Refactor Call Settings r=Arthur

========

https://hg.mozilla.org/integration/gaia-central/rev/5a8d2e654ef1
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 1145055 - [Settings] Call Settings refactor r=Arthur

========

https://hg.mozilla.org/integration/gaia-central/rev/67d81e3d873e
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1156607 - merge pull request #29752 from KevinGrandon:bug_1156607_ftu_jshint to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/a5f77546a207
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1156607 - Fix remaining FTU jshint issues r=sfoster
2015-04-29 23:45:23 -07:00
B2G Bumper Bot
5156581742 Bumping manifests a=b2g-bump 2015-04-29 23:05:09 -07:00
B2G Bumper Bot
d2c5b5f387 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/81f4252c2091
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1159256 - merge pull request #29779 from KevinGrandon:bug_1159256_card_icon_sizing to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/2bcde7fe3559
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1159256 - [TaskSwitcher] Select icon size based on container size and device resolution
2015-04-29 23:02:58 -07:00
B2G Bumper Bot
857adf42f5 Bumping manifests a=b2g-bump 2015-04-29 21:37:23 -07:00
B2G Bumper Bot
de150318c1 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/43f3eafb6131
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1156711 - merge pull request #29659 from steveck-chung:new-message-attachment-menu to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/539bca164c7e
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 1156711 - [Messages]Remove the attachment markup and replace it with option menu, r=azasypkin
2015-04-29 21:35:10 -07:00
B2G Bumper Bot
0264f92240 Bumping manifests a=b2g-bump 2015-04-29 21:20:06 -07:00
B2G Bumper Bot
7e0ad629a5 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/65385365cbd2
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1156202 - merge pull request #29606 from dwi2:bug1156202 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/94bc0bfa34af
Author: Tzu-Lin Huang <tzhuang@mozilla.com>
Desc: Bug 1156202 - [Stingray] search card within folders when remove cards

========

https://hg.mozilla.org/integration/gaia-central/rev/ce378f4e5c28
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1155421 - merge pull request #29653 from aron-bordin:change_string_message_draft to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/eb329eb58a09
Author: Aron Bordin <aron.bordin@gmail.com>
Desc:  Bug 1155421 - [Messages] Change "Discard" string to "Delete Draft" to clarify that draft will be deleted r=julien

========

https://hg.mozilla.org/integration/gaia-central/rev/0f1e1e9491e6
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1156183 - merge pull request #29736 from sean2449:Bug_1156183-move-channel to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/ca6d9520669e
Author: Sung Chiu <suchiu@mozilla.com>
Desc: Bug 1156183 - [Stingray][TvDeck] Move TVManager related API to ChannelManager
2015-04-29 21:17:52 -07:00
B2G Bumper Bot
e651ffab96 Bumping manifests a=b2g-bump 2015-04-29 19:52:34 -07:00
B2G Bumper Bot
c06685f2a2 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4c478bb5936d
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #29735 from cctuan/1155873

Bug 1155873 - [NFC] 'Swipe to share' screen can reveal homescreen if returning to home from image share (from notification)

========

https://hg.mozilla.org/integration/gaia-central/rev/4a1af8a02551
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 1155873 - prevent home and holdhome event while shrinking ui is active, r=alive
2015-04-29 19:50:23 -07:00
jlal@mozilla.com
16e58f5252 Bug 1159994 - Increase default builder timeout to 2 hours r=me a=bustage 2015-04-29 19:32:08 -07:00
B2G Bumper Bot
4f6721bcd0 Bumping manifests a=b2g-bump 2015-04-29 19:07:19 -07:00
B2G Bumper Bot
4a46fd7382 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/dec02bda980e
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #29776 from dmarcos/bug1157169master

Bug 1157169 - [Camera] The Self-timer overlaps with the Off

========

https://hg.mozilla.org/integration/gaia-central/rev/261342026909
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 1157169 - [Camera] The Self-timer overlaps with the Off

========

https://hg.mozilla.org/integration/gaia-central/rev/48b9e435cbdb
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #29806 from DouglasSherk/1158727-emergency-keypad-delete

Bug 1158727 - Fix Emergency Call keypad deletion when text cursor is placed. r=thills

========

https://hg.mozilla.org/integration/gaia-central/rev/65dc856dd05f
Author: Doug Sherk <github@sherk.me>
Desc: Bug 1158727 - Fix Emergency Call keypad deletion when text cursor is placed. r=thills
2015-04-29 19:05:09 -07:00
B2G Bumper Bot
77dc4aae8a Bumping manifests a=b2g-bump 2015-04-29 17:37:46 -07:00
B2G Bumper Bot
243f1c6575 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5c5a6e82ff16
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #29719 from davidflanagan/bug1150322

Bug 1150322 - make the seek bar behave a little better for songs of infi... r=squib,dkuo

========

https://hg.mozilla.org/integration/gaia-central/rev/391fe65e8b05
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 1150322 - make the seek bar behave a little better for songs of infinite duration
2015-04-29 17:35:29 -07:00
B2G Bumper Bot
9a5fd53ec9 Bumping manifests a=b2g-bump 2015-04-29 17:16:09 -07:00
B2G Bumper Bot
99511be261 Bumping gaia.json for 9 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7654966be8a1
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #29810 from lightsofapollo/bug-1159818

Bug 1159818 - Update marionette-client r=bustage

========

https://hg.mozilla.org/integration/gaia-central/rev/9f6d82d9fd10
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 1159818 - Update marionette-client r=bustage

========

https://hg.mozilla.org/integration/gaia-central/rev/6c7e621e1e0c
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 1158238 - [System] Add import activity r=kgrandon r=justindarc"

This reverts commit b51199638c04adfce235d123bfd837798f1f677d.

========

https://hg.mozilla.org/integration/gaia-central/rev/314ff153de32
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 1158238 - Follow-up, rename activity and add enable developer mode in test to not break when gecko patch lands r=kgrandon"

This reverts commit 111575e185cbfa3ab9928855509cdebb4369400a.

========

https://hg.mozilla.org/integration/gaia-central/rev/473715ede1ce
Author: James Lal <james@lightsofapollo.com>
Desc: NO BUG - Use aws-provisioner-v1 everywhere r=bustage

========

https://hg.mozilla.org/integration/gaia-central/rev/35652985f800
Author: James Lal <james@lightsofapollo.com>
Desc: NO BUG - Use aws-provisioner2 in decision task r=bustage

========

https://hg.mozilla.org/integration/gaia-central/rev/0b52c7620ed5
Author: James Lal <james@lightsofapollo.com>
Desc: NO BUG - Use aws-provisioner2 to prevent bustage r=bustage

========

https://hg.mozilla.org/integration/gaia-central/rev/36da42bb7c29
Author: Rob Wood <rwood@mozilla.com>
Desc: Merge pull request #29780 from rwood-moz/bug1159477

Bug 1159477 - Temporarily reduce raptor runs

========

https://hg.mozilla.org/integration/gaia-central/rev/131edb407257
Author: Rob Wood <rwood@mozilla.com>
Desc: Bug 1159477 - Temporarily reduce raptor runs
2015-04-29 17:13:55 -07:00
Fabrice Desré
22ef73628e Bug 1114676 - Enable web components for all apps when toggling developer mode r=ochameau 2015-04-29 17:12:20 -07:00
Wes Kocher
f7d03175b2 Merge fx-team to m-c a=merge CLOSED TREE 2015-04-29 16:46:00 -07:00
Wes Kocher
f6122406cf Merge inbound to m-c a=merge CLOSED TREE 2015-04-29 16:43:32 -07:00
Armen Zambrano Gasparnian
55b2e8e548 Bug 1159816 - Bump marionette_client to 0.12. DONTBUILD. CLOSED TREE. r=chmanchester 2015-04-29 16:35:33 -04:00
Wes Kocher
05ab65962a Merge m-c to fx-team a=merge CLOSED TREE 2015-04-29 13:10:20 -07:00
Wes Kocher
67807de93a Merge m-c to b2ginbound a=merge CLOSED TREE 2015-04-29 13:08:47 -07:00
Wes Kocher
4d78356beb Merge m-c to inbound a=merge CLOSED TREE 2015-04-29 13:08:07 -07:00
Ben Kelly
0b12868eb6 Bug 1154325 P3 Re-enable service-workers/cache-storage WPT tests. r=jgraham 2015-04-29 09:03:15 -07:00
Ben Kelly
b3af76846a Bug 1154325 P2 Use Blobs for CacheStorage keys to avoid encoding issues. r=ehsan 2015-04-29 09:03:15 -07:00
Ben Kelly
9f4d2c5641 Bug 1154325 P1 Add convenience routines to bind and get Blobs as strings. r=asuth 2015-04-29 09:03:15 -07:00
Ben Kelly
70c4125c44 Bug 1120501 P2 Move Cache Add/AddAll logic to child process. r=ehsan,smaug 2015-04-29 08:59:43 -07:00
Ben Kelly
03d50f7e11 Bug 1120501 P1 Make it easier to use Promise::All() from C++ code. r=nsm 2015-04-29 08:59:43 -07:00
Mason Chang
df541fb650 Bug 1155823 - Properly shutdown the CompositorVsyncDispatcher. r=kats 2015-04-29 08:48:31 -07:00
Jacek Caban
1c7b255be2 Bug 1156131 - mingw cross compilation fixup. 2015-04-29 17:39:35 +02:00