66422737fb
merge fx-team to mozilla-central
2014-03-27 14:14:32 +01:00
84e1bc2be7
merge mozilla-inbound to mozilla-central
2014-03-27 14:09:23 +01:00
cda4225f53
Bumping manifests a=b2g-bump
2014-03-27 05:52:36 -07:00
f19828361b
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/862009340c01
Author: AndreiH <andrei.hutusoru@softvision.ro>
Desc: Merge pull request #17325 from AndreiH/bug_984604_2
Bug 984604 - Running without --restart when FTU is open does not work, r=davehunt
========
https://hg.mozilla.org/integration/gaia-central/rev/4fca5bb10147
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 984604 - Running without --restart when FTU is open does not work
2014-03-27 05:50:57 -07:00
ca7f40c877
Bumping manifests a=b2g-bump
2014-03-27 05:41:09 -07:00
63ab9fd6c5
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/c541b74ca62d
Author: Carsten Book -Tomcat- <cbook@mozilla.com>
Desc: Revert "Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps" build failure
This reverts commit c965501afb3849cb1b10b0738c86fe9e450e8b9a.
2014-03-27 05:35:58 -07:00
21b5151458
Bumping manifests a=b2g-bump
2014-03-27 05:02:35 -07:00
e9baa8e3a8
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/657c17e410de
Author: Sergi Mansilla <sergi.mansilla@gmail.com>
Desc: Merge pull request #17520 from sergi/885545-photo-blob
Bug 885545 - Create Blobs for Contact photos in the VCF importer
========
https://hg.mozilla.org/integration/gaia-central/rev/e12d68f23fb1
Author: Sergi Mansilla <sergi.mansilla@gmail.com>
Desc: Bug 885545 - Create Blobs for Contact photos in the VCF importer
2014-03-27 05:00:56 -07:00
ebf897d34c
Bumping manifests a=b2g-bump
2014-03-27 04:26:12 -07:00
072d8a80bf
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/ee57ea11db8c
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #17693 from yurenju/stage-windows-squash-3
Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau
========
https://hg.mozilla.org/integration/gaia-central/rev/b5bd3bbd054b
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps
Conflicts:
Makefile
apps/communications/build/build.js
build/copy-build-stage-manifest.js
build/test/integration/distribution.test.js
build/utils-xpc.js
build/utils.js
build/webapp-manifests.js
2014-03-27 04:21:08 -07:00
2ddcad089c
Bumping manifests a=b2g-bump
2014-03-27 03:48:09 -07:00
515e892b34
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/7404866e6b75
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #17702 from comoyo/colemak
Bug 976248 - Colemak keyboard layout added. r=janjongboom
========
https://hg.mozilla.org/integration/gaia-central/rev/7ea01dd8f59f
Author: Liszy Szilveszter <cryorat@fedoraproject.org>
Desc: Bug 976248 - Colemak keyboard layout added
2014-03-27 03:47:58 -07:00
41ccdb8f5d
Bug 983576: Annotate all assertions for non-main threads in BlueZ backend, r=echou
...
This patch adds an annotation to each assertion for non-main threads in
the BlueZ backend of Bluetooth. This should make is easy and obvious to
see in which context a method or function is expected to run.
2014-03-27 11:43:49 +01:00
f756e17674
Bug 983576: Annotate global BlueZ variables, r=echou
...
The global variables in BluetoothDBusService.cpp are now annotated
for their multi-threading access. Some code still seems to access
some of these variables in an unprotected manner. Follow-up patches
should clean this up.
As a side effect, this patch makes several variables as constant,
which improves correctness of the code.
2014-03-27 11:43:49 +01:00
49823019b0
Bug 983576: Fail if sDBusConnection is not set, r=echou
...
Until now, we had corner cases in Bluetooth where DBus messages might
have been received on connections that are shutting down. This can't
happen any longer and this patch replaces the respective tests with
assertions.
2014-03-27 11:43:49 +01:00
371fc3f23b
Bug 983576: Refactor BlueZ start/stop code, r=echou
...
With this patch, the start code of Bluetooth's BlueZ back mostly
runs on the I/O thread. Only the loading of the BT firmware and
the blocking connection setup is done on the BT thread.
The stop code has been moved to the I/O thread, except for some
initial waiting and the final cleanup of the firmware. The code
doesn't wait for errors anymore when cleaning up the connection
to DBus. This makes it run completely non-blocking. The initial
waiting may later be replaced by something more sophisticated.
2014-03-27 11:43:48 +01:00
b2c765fcbf
Bug 983576: Move DispatchToBtThread to mozilla::bluetooth namespace, r=echou
...
This patch moves DispatchToBtThread to mozilla::bluetooth, so that
it is available on the I/O thread.
2014-03-27 11:43:48 +01:00
176830d27b
Bumping manifests a=b2g-bump
2014-03-27 03:31:08 -07:00
2f69dc87e2
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/5677b873c0d3
Author: Carsten Book -Tomcat- <cbook@mozilla.com>
Desc: Revert "Bug 971512 - [System] Instantiable layout manager" for gaia unit test failure
This reverts commit 8d89fc1c523e46e7ff6ec45687605c7b60f91a34.
2014-03-27 03:25:59 -07:00
375a7acb80
Bumping manifests a=b2g-bump
2014-03-27 03:16:13 -07:00
36eee216b9
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/49db49ae1acf
Author: EragonJ <eragonj@eragonj.me>
Desc: Merge pull request #16014 from EragonJ/bug-962927
Bug 962927 - [DSDS] After PUK is locked, SIM manager did not show "No SI...
========
https://hg.mozilla.org/integration/gaia-central/rev/e82d6df6faf9
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 962927 - [DSDS] After PUK is locked, SIM manager did not show "No SIM card"
- we can automatically set on differnt card in this PUK case
- add related test
- add permanentBlocked state in the other files' mapping table
2014-03-27 03:10:58 -07:00
7ab5d62d12
Bumping manifests a=b2g-bump
2014-03-27 03:06:12 -07:00
d5ba690023
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/64cc57b5a051
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #17697 from dmarcos/bug988287
Bug 988287 - [CAMERA][MADAI] HUD is receiving click events when it is in...
========
https://hg.mozilla.org/integration/gaia-central/rev/499681502671
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 988287 - [CAMERA][MADAI] HUD is receiving click events when it is invisible state
2014-03-27 03:01:06 -07:00
a1cae5603a
Bug 986440: Add missing field |number| for REQUEST_QUERY_CALL_FORWARD_STATUS, r=htsai
...
The field |number| is missing when REQUEST_QUERY_CALL_FORWARD_STATUS
gets invoked from RilContentHelper.js. This patch adds a test to the
function |queryCallForwardingStatus| for handling this case.
--HG--
extra : rebase_source : c56474a2023434ac3658c7771244c6380ca2a6e0
2014-03-27 10:35:30 +01:00
22ff293288
Bug 986440: Check for |radioTech| in |voiceRegistrationState|, r=htsai
...
When starting up RIL, |radioTech| in |voiceRegistrationState| is not
defined before we received REQUEST_VOICE_REGISTRATION_STATE. This
patch adds an extra test to avoid the respective error message.
--HG--
extra : rebase_source : 19927ec9a3892606d81f3209ea470ce297d927d7
2014-03-27 10:35:24 +01:00
21da4b0c37
Bug 986440: Test for |options.rilMessageType| in REQUEST_GET_SMSC_ADDRESS handler, r=htsai
...
The response handler for REQUEST_GET_SMSC_ADDRESS expects the field
|rilMessageType| to be present in its options. This is not the case
if the request was generated from within ril_worker.js.
This patch handles this case by adding an extra test for the existance
of the field. The response handler will return without sending a reply
to the content helper. This is not a problem since the content handler
did not invoke the request anyway.
--HG--
extra : rebase_source : 211d5f4dc29dd99b745bc29d856c291175f156f1
2014-03-27 10:35:17 +01:00
0348736e81
Bug 986440: Return 'null' from RIL-worker function, r=htsai
...
One of the functions in ril_worker.js is supposed to return 'null'
on errors, but returns 'undefined' instead. This patch fixes the
problem.
--HG--
extra : rebase_source : 0f0c1cc06fb4bcb6fe034ab3c88890b351a6cad6
2014-03-27 10:35:09 +01:00
081b614231
Bumping manifests a=b2g-bump
2014-03-27 02:37:58 -07:00
70f7527180
Bumping gaia.json for 8 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/81ab3eca0972
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #17648 from Archaeopteryx/settings-bug988296-imsSettingsHeader
Bug 988296 - imsSettings-header points to messageSettings, should be imsSettings ('Message settings' vs. 'IMS settings'). r=arthurcc
========
https://hg.mozilla.org/integration/gaia-central/rev/f173051314f0
Author: Sebastian Hengst <archaeopteryx@coole-files.de>
Desc: Bug 988296 - imsSettings-header points to messageSettings, should be imsSettings ('Message settings' vs. 'IMS settings')
========
https://hg.mozilla.org/integration/gaia-central/rev/de294db4916a
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #17234 from gasolin/issue-984265
Bug 984265 - JSHint fixes for shared/js, r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/8c6db0984738
Author: gasolin <gasolin@gmail.com>
Desc: Bug 984265 - JSHint fixes for shared/js
========
https://hg.mozilla.org/integration/gaia-central/rev/30f5e0567872
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #17692 from gasolin/issue-982033
Bug 982033 - change layout manager instantiate place to solve app_window..., r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/5eab86aee324
Author: gasolin <gasolin@gmail.com>
Desc: Bug 982033 - change layout manager instantiate place to solve app_window dependency
========
https://hg.mozilla.org/integration/gaia-central/rev/faff9e749627
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #17694 from dmarcos/bug986763
Bug 986763 - [Camera][Madai] Very short video not saved.
========
https://hg.mozilla.org/integration/gaia-central/rev/39eafbf78e45
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 986763 - [Camera][Madai] Very short video not saved.
2014-03-27 02:37:47 -07:00
3658bfa967
Backed out changeset 52f43e3f552f (bug 619558) for frequent mochitest other test failure on OS X 10.8
2014-03-27 10:14:39 +01:00
f34b0065c9
Bug 975211 - Create backend logic to provide list of Tiles and associated metadata (image, text, background color) [r=adw]
...
Package a list of directory links to expose via DirectoryLinksProvider.jsm
2014-03-27 01:03:42 -07:00
b821d7b5bb
Bumping manifests a=b2g-bump
2014-03-26 23:21:12 -07:00
23dcce9579
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/57c407d3e94b
Author: Luke Chang <lchang@mozilla.com>
Desc: Merge pull request #17684 from luke-chang/976413_start_stop_activity_window_factory_v2
Bug 976413 - [System2] Add start/stop methods to ActivityWindowFactory, r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/81ffcfd3f088
Author: Luke Chang <lchang@mozilla.com>
Desc: Bug 976413 - [System2] Add start/stop methods to ActivityWindowFactory
2014-03-26 23:16:03 -07:00
5e1b967863
Bug 965811 - Support Firefox Account-based Sync in SendTabActivity. r=nalexander
2014-03-26 22:21:19 -07:00
0108f912d1
Bug 983856 - Message when syncing is disabled by Android. r=rnewman
2014-03-26 22:11:05 -07:00
4e04effddf
Bug 983860 - Fixed a copy-paste error and replaced log message in AndroidFxAccount.enableSyncing() to say "Enabling" instead of "Disabling"; r=nalexander
2014-03-26 22:00:58 -07:00
e9fece6d0b
Bumping manifests a=b2g-bump
2014-03-26 21:26:10 -07:00
0846272c0f
Bug 981852 - Push GeckoEvents to a background thread. r=mfinkle
2014-03-26 21:21:40 -07:00
e15ab02426
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/7c7d1648ba4e
Author: Luke Chang <lchang@mozilla.com>
Desc: Merge pull request #17638 from luke-chang/971458_instantiable_app_window_factory_v2
Bug 971458 - [System2] Instantiable AppWindowFactory, r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/ed773fec11b6
Author: Luke Chang <lchang@mozilla.com>
Desc: Bug 971458 - [System2] Instantiable AppWindowFactory
========
https://hg.mozilla.org/integration/gaia-central/rev/b068c13545a6
Author: EragonJ <eragonj@eragonj.me>
Desc: Merge pull request #17573 from EragonJ/bug-960861-fix
Bug 960861 - mozMobileConnections should not be requisites for airplane ...
========
https://hg.mozilla.org/integration/gaia-central/rev/8bdf0d4988be
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 960861 - mozMobileConnections should not be requisites for airplane ...
========
https://hg.mozilla.org/integration/gaia-central/rev/63dff6cccf50
Author: Luke Chang <lchang@mozilla.com>
Desc: Merge pull request #17680 from luke-chang/988270_appwindowmanager_cause_unit_test_failed
Bug 988270 - The unit test of AppWindowManager will break other tests in system app, r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/15d0692ac4f3
Author: Luke Chang <lchang@mozilla.com>
Desc: Bug 988270 - The unit test of AppWindowManager will break other tests in system app
2014-03-26 21:21:06 -07:00
c59f972c4b
Bug 957668. Protect against a null frame. r=nullcheck CLOSED TREE
2014-03-26 23:20:23 -05:00
dde00b3715
Bumping manifests a=b2g-bump
2014-03-26 21:07:36 -07:00
1b738b87f0
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a910be555f0c
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #17607 from nullaus/bug981764
bug 981764
========
https://hg.mozilla.org/integration/gaia-central/rev/1bc66b245735
Author: Ghislain 'Aus' Lacroix <aus@mozilla.com>
Desc: bug 981764
* Add 'cardviewbeforeshow' and 'cardviewbeforeclose' events to cards view.
* Added handling of 'cardviewbeforeshow' and 'cardviewbeforeclose' to HomescreenLauncher
so that it will now fadeOut the homescreen before the card view is shown and fadeIn the
homescreen before the card view is closed.
* Added tests for new homescreen launcher behavior.
r=alive
2014-03-26 21:06:02 -07:00
400fccaac5
Bumping manifests a=b2g-bump
2014-03-26 20:46:24 -07:00
d1bbffdd3d
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/453d338ad775
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #17628 from crh0716/988148
Bug 988148 - Hide the mobile connection state if it is emergency calls only and not primary sim r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/1ee808200b04
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 988148 - Hide the mobile connection state if it is emergency calls only and not primary sim
2014-03-26 20:41:12 -07:00
21f8ea6d11
Bumping manifests a=b2g-bump
2014-03-26 20:21:13 -07:00
355e6fc30e
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/171943c1126a
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #17428 from alivedise/bugzilla/982491_master/parent-app
Bug 982491 - Add parent app manifestURL if there is, r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/d13a5b8a3423
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 982491 - Add parent app manifestURL if there is
2014-03-26 20:11:45 -07:00
c5fd173c74
Merge m-c to inbound.
2014-03-26 23:09:54 -04:00
2e5f87b07d
Merge m-c to b2g-inbound.
2014-03-26 23:09:04 -04:00
3cb7902f97
Merge m-c to fx-team.
2014-03-26 23:08:02 -04:00
527c7f27c8
Bumping manifests a=b2g-bump
2014-03-26 20:06:09 -07:00
Carsten "Tomcat" Book
B2G Bumper Bot
Thomas Zimmermann
Olivier Yiptong
Richard Newman
Nick Alexander
Ashwin Swaroop
Wes Johnston
Timothy Nikkel
Ryan VanderMeulen