Commit Graph

19438 Commits

Author SHA1 Message Date
Kyle Huey
b7194c8d91 Bug 957693: Check the state of the sync loop after processing control runnables, which might cause the world to shift underneath us. r=bent 2014-01-13 15:22:53 -08:00
Ryan VanderMeulen
36a1449613 Merge m-c to inbound. 2014-01-13 17:52:40 -05:00
Andrea Marchesini
aad7f635be Bug 959190 - [URL API] stringify href attribute, r=bz 2014-01-13 23:46:04 +01:00
Ryan VanderMeulen
4d0972315d Merge inbound to m-c. 2014-01-13 17:44:24 -05:00
Ryan VanderMeulen
6725bcbcb0 Merge fx-team to m-c. 2014-01-13 17:37:49 -05:00
Jan Varga
b9d9673c5a Bug 924348 - Intermittent PROCESS-CRASH | /tests/dom/indexedDB/test/test_add_put.html | application crashed [@ sqlite3LeaveMutexAndCloseZombie] or [@ hashDestroy]. r=khuey
CLOSED TREE
2014-01-13 13:27:19 -05:00
Fabrice Desré
9e994fab01 Bug 958773 - Don't use js-ctypes in the ril worker r=vicamo 2014-01-13 10:16:05 -08:00
Kyle Huey
b067191a55 Bug 959070: Make sure to call ScriptExecutorRunnable's base class's Cancel method too. r=janv 2014-01-13 09:41:02 -08:00
Albert Crespell
c0bc28d7eb Bug 952029 - ClearStats method fails after restart if data connection is disabled. r=gene 2014-01-13 14:24:44 +01:00
Tim Chien
e652b24068 Bug 878003 - Test for getScreenshot transparency. r=smaug 2014-01-13 08:55:15 -05:00
Ryan VanderMeulen
930c28ef10 Backed out changesets e8b0b4daa733 and d89066cb6f59 (bug 853972) for mochitest-bc timeouts. 2014-01-13 11:37:19 -05:00
Sumit Agrawal
28be2ce286 Bug 958354 - OS.Constants.Path should expose UAppData. r=Yoric 2014-01-13 08:45:20 -05:00
Jared Wein
5d15cb981b Bug 853972 - Clicking on a notification should select the originating tab. r=felipe,wchen
--HG--
extra : rebase_source : bfbf92b91d7562404b54b87f25f879881be7643a
2014-01-13 13:56:28 +01:00
Carsten "Tomcat" Book
84b7f73006 merge b2g-inbound to mozilla-central 2014-01-13 12:49:54 +01:00
Ben Tian
909dc966f6 Bug 949930 - CameraControl.sensorAngle doesn't return consistent angle among different devices, r=mikeh, a=1.3+ 2014-01-13 10:12:40 +08:00
Vicamo Yang
39f8b4c336 Bug 934125 - 3.b/3: fix alignment. r=gene 2014-01-13 10:44:56 +08:00
Vicamo Yang
626cfc33a2 Bug 934125 - 3.a/3: correct ril_worker 'RIL[FOO] = function FOO()' as well. r=gene
sed -i dom/system/gonk/ril_worker.js -e '/^RIL\[\w\+\] =/ {N; s/RIL\[\(\w\+\)\] =\s*function \w\+(/RIL[\1] = function(/}'
2014-01-13 10:44:52 +08:00
Vicamo Yang
5d53c27a4c Bug 934125 - 2.b/3: fix alignment. r=gene
for f in `git show --name-only | grep ^dom/`; do
  [ -n "`grep -e '\w\+: function([^)]*\$' $f`" ] && echo $f;
done | xargs sh -c 'rvim "$@" </dev/tty' asdf
2014-01-13 10:44:44 +08:00
Vicamo Yang
91e5172240 Bug 934125 - 2.a/3: s/\(\w\+\): function \(\w\+\)(/\1: function(/ . r=gene
RILDIRS="dom/cellbroadcast/ dom/icc/ dom/mobilemessage/ dom/network/ dom/telephony/ dom/voicemail/ dom/system/gonk/";
for f in `find $RILDIRS -type f -name \*.js -o -name \*.jsm`; do
  sed -i $f -e '/\w\+:/ {N; s/\(\w\+\):\s*function \(\w\+\)(/\1: function(/g}';
done
grep -nRe '\w\+: function \w\+(' $RILDIRS
2014-01-13 10:44:40 +08:00
Vicamo Yang
95c21b2c67 Bug 934125 - 1/3: s/function \+(/function(/ . r=gene
RILDIRS="dom/cellbroadcast/ dom/icc/ dom/mobilemessage/ dom/network/ dom/telephony/ dom/voicemail/ dom/system/gonk/";
for f in `find $RILDIRS -type f -name \*.js -o -name \*.jsm`; do
  sed -i $f -e 's/function \+(/function(/';
done
2014-01-13 10:44:33 +08:00
Ryan VanderMeulen
00c6315595 Merge inbound to m-c. 2014-01-10 14:46:40 -05:00
Robert O'Callahan
19391253d9 Bug 946065. Part 4: Move content/xbl to dom/ and flatten away 'src' directory. r=Ms2ger
--HG--
rename : content/xbl/src/XBLChildrenElement.cpp => dom/xbl/XBLChildrenElement.cpp
rename : content/xbl/src/XBLChildrenElement.h => dom/xbl/XBLChildrenElement.h
rename : content/xbl/builtin/android/jar.mn => dom/xbl/builtin/android/jar.mn
rename : content/xbl/builtin/android/moz.build => dom/xbl/builtin/android/moz.build
rename : content/xbl/builtin/android/platformHTMLBindings.xml => dom/xbl/builtin/android/platformHTMLBindings.xml
rename : content/xbl/builtin/browser-base.inc => dom/xbl/builtin/browser-base.inc
rename : content/xbl/builtin/editor-base.inc => dom/xbl/builtin/editor-base.inc
rename : content/xbl/builtin/emacs/jar.mn => dom/xbl/builtin/emacs/jar.mn
rename : content/xbl/builtin/emacs/moz.build => dom/xbl/builtin/emacs/moz.build
rename : content/xbl/builtin/emacs/platformHTMLBindings.xml => dom/xbl/builtin/emacs/platformHTMLBindings.xml
rename : content/xbl/builtin/input-fields-base.inc => dom/xbl/builtin/input-fields-base.inc
rename : content/xbl/builtin/mac/jar.mn => dom/xbl/builtin/mac/jar.mn
rename : content/xbl/builtin/mac/moz.build => dom/xbl/builtin/mac/moz.build
rename : content/xbl/builtin/mac/platformHTMLBindings.xml => dom/xbl/builtin/mac/platformHTMLBindings.xml
rename : content/xbl/builtin/moz.build => dom/xbl/builtin/moz.build
rename : content/xbl/builtin/textareas-base.inc => dom/xbl/builtin/textareas-base.inc
rename : content/xbl/builtin/unix/jar.mn => dom/xbl/builtin/unix/jar.mn
rename : content/xbl/builtin/unix/moz.build => dom/xbl/builtin/unix/moz.build
rename : content/xbl/builtin/unix/platformHTMLBindings.xml => dom/xbl/builtin/unix/platformHTMLBindings.xml
rename : content/xbl/builtin/win/jar.mn => dom/xbl/builtin/win/jar.mn
rename : content/xbl/builtin/win/moz.build => dom/xbl/builtin/win/moz.build
rename : content/xbl/builtin/win/platformHTMLBindings.xml => dom/xbl/builtin/win/platformHTMLBindings.xml
rename : content/xbl/crashtests/205735-1.xhtml => dom/xbl/crashtests/205735-1.xhtml
rename : content/xbl/crashtests/223799-1.xul => dom/xbl/crashtests/223799-1.xul
rename : content/xbl/crashtests/226744-1.xhtml => dom/xbl/crashtests/226744-1.xhtml
rename : content/xbl/crashtests/232095-1.xul => dom/xbl/crashtests/232095-1.xul
rename : content/xbl/crashtests/277523-1.xhtml => dom/xbl/crashtests/277523-1.xhtml
rename : content/xbl/crashtests/277950-1.xhtml => dom/xbl/crashtests/277950-1.xhtml
rename : content/xbl/crashtests/336744-1-inner.html => dom/xbl/crashtests/336744-1-inner.html
rename : content/xbl/crashtests/336744-1.html => dom/xbl/crashtests/336744-1.html
rename : content/xbl/crashtests/336960-1-inner.xhtml => dom/xbl/crashtests/336960-1-inner.xhtml
rename : content/xbl/crashtests/336960-1.html => dom/xbl/crashtests/336960-1.html
rename : content/xbl/crashtests/342954-1.xhtml => dom/xbl/crashtests/342954-1.xhtml
rename : content/xbl/crashtests/342954-2-xbl.xml => dom/xbl/crashtests/342954-2-xbl.xml
rename : content/xbl/crashtests/342954-2.xhtml => dom/xbl/crashtests/342954-2.xhtml
rename : content/xbl/crashtests/368276-1.xhtml => dom/xbl/crashtests/368276-1.xhtml
rename : content/xbl/crashtests/368641-1.xhtml => dom/xbl/crashtests/368641-1.xhtml
rename : content/xbl/crashtests/378521-1.xhtml => dom/xbl/crashtests/378521-1.xhtml
rename : content/xbl/crashtests/382376-1.xhtml => dom/xbl/crashtests/382376-1.xhtml
rename : content/xbl/crashtests/382376-2.xhtml => dom/xbl/crashtests/382376-2.xhtml
rename : content/xbl/crashtests/397596-1.xhtml => dom/xbl/crashtests/397596-1.xhtml
rename : content/xbl/crashtests/404125-1.xhtml => dom/xbl/crashtests/404125-1.xhtml
rename : content/xbl/crashtests/406900-1.xul => dom/xbl/crashtests/406900-1.xul
rename : content/xbl/crashtests/406904-1.xhtml => dom/xbl/crashtests/406904-1.xhtml
rename : content/xbl/crashtests/406904-2.xhtml => dom/xbl/crashtests/406904-2.xhtml
rename : content/xbl/crashtests/415192-1.xul => dom/xbl/crashtests/415192-1.xul
rename : content/xbl/crashtests/415301-1.xul => dom/xbl/crashtests/415301-1.xul
rename : content/xbl/crashtests/418133-1.xhtml => dom/xbl/crashtests/418133-1.xhtml
rename : content/xbl/crashtests/420233-1.xhtml => dom/xbl/crashtests/420233-1.xhtml
rename : content/xbl/crashtests/421997-1.xhtml => dom/xbl/crashtests/421997-1.xhtml
rename : content/xbl/crashtests/432813-1-xbl.xml => dom/xbl/crashtests/432813-1-xbl.xml
rename : content/xbl/crashtests/432813-1.xhtml => dom/xbl/crashtests/432813-1.xhtml
rename : content/xbl/crashtests/454820-1.html => dom/xbl/crashtests/454820-1.html
rename : content/xbl/crashtests/460665-1.xhtml => dom/xbl/crashtests/460665-1.xhtml
rename : content/xbl/crashtests/463511-1.xhtml => dom/xbl/crashtests/463511-1.xhtml
rename : content/xbl/crashtests/464863-1.xhtml => dom/xbl/crashtests/464863-1.xhtml
rename : content/xbl/crashtests/472260-1.xhtml => dom/xbl/crashtests/472260-1.xhtml
rename : content/xbl/crashtests/477878-1.html => dom/xbl/crashtests/477878-1.html
rename : content/xbl/crashtests/492978-1.xul => dom/xbl/crashtests/492978-1.xul
rename : content/xbl/crashtests/493123-1.xhtml => dom/xbl/crashtests/493123-1.xhtml
rename : content/xbl/crashtests/495354-1.xhtml => dom/xbl/crashtests/495354-1.xhtml
rename : content/xbl/crashtests/507628-1.xhtml => dom/xbl/crashtests/507628-1.xhtml
rename : content/xbl/crashtests/507991-1.xhtml => dom/xbl/crashtests/507991-1.xhtml
rename : content/xbl/crashtests/830614-1.xul => dom/xbl/crashtests/830614-1.xul
rename : content/xbl/crashtests/895805-1.xhtml => dom/xbl/crashtests/895805-1.xhtml
rename : content/xbl/crashtests/crashtests.list => dom/xbl/crashtests/crashtests.list
rename : content/xbl/crashtests/set-field-bad-this.xhtml => dom/xbl/crashtests/set-field-bad-this.xhtml
rename : content/xbl/src/moz.build => dom/xbl/moz.build
rename : content/xbl/src/nsBindingManager.cpp => dom/xbl/nsBindingManager.cpp
rename : content/xbl/src/nsBindingManager.h => dom/xbl/nsBindingManager.h
rename : content/xbl/src/nsXBLBinding.cpp => dom/xbl/nsXBLBinding.cpp
rename : content/xbl/src/nsXBLBinding.h => dom/xbl/nsXBLBinding.h
rename : content/xbl/src/nsXBLContentSink.cpp => dom/xbl/nsXBLContentSink.cpp
rename : content/xbl/src/nsXBLContentSink.h => dom/xbl/nsXBLContentSink.h
rename : content/xbl/src/nsXBLDocumentInfo.cpp => dom/xbl/nsXBLDocumentInfo.cpp
rename : content/xbl/src/nsXBLDocumentInfo.h => dom/xbl/nsXBLDocumentInfo.h
rename : content/xbl/src/nsXBLEventHandler.cpp => dom/xbl/nsXBLEventHandler.cpp
rename : content/xbl/src/nsXBLEventHandler.h => dom/xbl/nsXBLEventHandler.h
rename : content/xbl/src/nsXBLMaybeCompiled.h => dom/xbl/nsXBLMaybeCompiled.h
rename : content/xbl/src/nsXBLProtoImpl.cpp => dom/xbl/nsXBLProtoImpl.cpp
rename : content/xbl/src/nsXBLProtoImpl.h => dom/xbl/nsXBLProtoImpl.h
rename : content/xbl/src/nsXBLProtoImplField.cpp => dom/xbl/nsXBLProtoImplField.cpp
rename : content/xbl/src/nsXBLProtoImplField.h => dom/xbl/nsXBLProtoImplField.h
rename : content/xbl/src/nsXBLProtoImplMember.h => dom/xbl/nsXBLProtoImplMember.h
rename : content/xbl/src/nsXBLProtoImplMethod.cpp => dom/xbl/nsXBLProtoImplMethod.cpp
rename : content/xbl/src/nsXBLProtoImplMethod.h => dom/xbl/nsXBLProtoImplMethod.h
rename : content/xbl/src/nsXBLProtoImplProperty.cpp => dom/xbl/nsXBLProtoImplProperty.cpp
rename : content/xbl/src/nsXBLProtoImplProperty.h => dom/xbl/nsXBLProtoImplProperty.h
rename : content/xbl/src/nsXBLPrototypeBinding.cpp => dom/xbl/nsXBLPrototypeBinding.cpp
rename : content/xbl/src/nsXBLPrototypeBinding.h => dom/xbl/nsXBLPrototypeBinding.h
rename : content/xbl/src/nsXBLPrototypeHandler.cpp => dom/xbl/nsXBLPrototypeHandler.cpp
rename : content/xbl/src/nsXBLPrototypeHandler.h => dom/xbl/nsXBLPrototypeHandler.h
rename : content/xbl/src/nsXBLPrototypeResources.cpp => dom/xbl/nsXBLPrototypeResources.cpp
rename : content/xbl/src/nsXBLPrototypeResources.h => dom/xbl/nsXBLPrototypeResources.h
rename : content/xbl/src/nsXBLResourceLoader.cpp => dom/xbl/nsXBLResourceLoader.cpp
rename : content/xbl/src/nsXBLResourceLoader.h => dom/xbl/nsXBLResourceLoader.h
rename : content/xbl/src/nsXBLSerialize.cpp => dom/xbl/nsXBLSerialize.cpp
rename : content/xbl/src/nsXBLSerialize.h => dom/xbl/nsXBLSerialize.h
rename : content/xbl/src/nsXBLService.cpp => dom/xbl/nsXBLService.cpp
rename : content/xbl/src/nsXBLService.h => dom/xbl/nsXBLService.h
rename : content/xbl/src/nsXBLWindowKeyHandler.cpp => dom/xbl/nsXBLWindowKeyHandler.cpp
rename : content/xbl/src/nsXBLWindowKeyHandler.h => dom/xbl/nsXBLWindowKeyHandler.h
rename : content/xbl/test/bug310107-resource.xhtml => dom/xbl/test/bug310107-resource.xhtml
rename : content/xbl/test/chrome.ini => dom/xbl/test/chrome.ini
rename : content/xbl/test/file_bug372769.xhtml => dom/xbl/test/file_bug372769.xhtml
rename : content/xbl/test/file_bug379959_cross.html => dom/xbl/test/file_bug379959_cross.html
rename : content/xbl/test/file_bug379959_data.html => dom/xbl/test/file_bug379959_data.html
rename : content/xbl/test/file_bug379959_xbl.xml => dom/xbl/test/file_bug379959_xbl.xml
rename : content/xbl/test/file_bug397934.xhtml => dom/xbl/test/file_bug397934.xhtml
rename : content/xbl/test/file_bug481558.xbl => dom/xbl/test/file_bug481558.xbl
rename : content/xbl/test/file_bug481558css.sjs => dom/xbl/test/file_bug481558css.sjs
rename : content/xbl/test/file_bug591198_inner.html => dom/xbl/test/file_bug591198_inner.html
rename : content/xbl/test/file_bug591198_xbl.xml => dom/xbl/test/file_bug591198_xbl.xml
rename : content/xbl/test/file_bug821850.xhtml => dom/xbl/test/file_bug821850.xhtml
rename : content/xbl/test/file_bug844783.xhtml => dom/xbl/test/file_bug844783.xhtml
rename : content/xbl/test/file_bug944407.html => dom/xbl/test/file_bug944407.html
rename : content/xbl/test/file_bug944407.xml => dom/xbl/test/file_bug944407.xml
rename : content/xbl/test/file_bug950909.html => dom/xbl/test/file_bug950909.html
rename : content/xbl/test/file_bug950909.xml => dom/xbl/test/file_bug950909.xml
rename : content/xbl/test/mochitest.ini => dom/xbl/test/mochitest.ini
rename : content/xbl/test/moz.build => dom/xbl/test/moz.build
rename : content/xbl/test/test_bug310107.html => dom/xbl/test/test_bug310107.html
rename : content/xbl/test/test_bug366770.html => dom/xbl/test/test_bug366770.html
rename : content/xbl/test/test_bug371724.xhtml => dom/xbl/test/test_bug371724.xhtml
rename : content/xbl/test/test_bug372769.html => dom/xbl/test/test_bug372769.html
rename : content/xbl/test/test_bug378518.xul => dom/xbl/test/test_bug378518.xul
rename : content/xbl/test/test_bug378866.xhtml => dom/xbl/test/test_bug378866.xhtml
rename : content/xbl/test/test_bug379959.html => dom/xbl/test/test_bug379959.html
rename : content/xbl/test/test_bug389322.xhtml => dom/xbl/test/test_bug389322.xhtml
rename : content/xbl/test/test_bug397934.html => dom/xbl/test/test_bug397934.html
rename : content/xbl/test/test_bug398135.xul => dom/xbl/test/test_bug398135.xul
rename : content/xbl/test/test_bug398492.xul => dom/xbl/test/test_bug398492.xul
rename : content/xbl/test/test_bug400705.xhtml => dom/xbl/test/test_bug400705.xhtml
rename : content/xbl/test/test_bug401907.xhtml => dom/xbl/test/test_bug401907.xhtml
rename : content/xbl/test/test_bug403162.xhtml => dom/xbl/test/test_bug403162.xhtml
rename : content/xbl/test/test_bug468210.xhtml => dom/xbl/test/test_bug468210.xhtml
rename : content/xbl/test/test_bug481558.html => dom/xbl/test/test_bug481558.html
rename : content/xbl/test/test_bug526178.xhtml => dom/xbl/test/test_bug526178.xhtml
rename : content/xbl/test/test_bug542406.xhtml => dom/xbl/test/test_bug542406.xhtml
rename : content/xbl/test/test_bug591198.html => dom/xbl/test/test_bug591198.html
rename : content/xbl/test/test_bug639338.xhtml => dom/xbl/test/test_bug639338.xhtml
rename : content/xbl/test/test_bug721452.xul => dom/xbl/test/test_bug721452.xul
rename : content/xbl/test/test_bug723676.xul => dom/xbl/test/test_bug723676.xul
rename : content/xbl/test/test_bug772966.xul => dom/xbl/test/test_bug772966.xul
rename : content/xbl/test/test_bug790265.xhtml => dom/xbl/test/test_bug790265.xhtml
rename : content/xbl/test/test_bug821850.html => dom/xbl/test/test_bug821850.html
rename : content/xbl/test/test_bug844783.html => dom/xbl/test/test_bug844783.html
rename : content/xbl/test/test_bug944407.xul => dom/xbl/test/test_bug944407.xul
rename : content/xbl/test/test_bug950909.xul => dom/xbl/test/test_bug950909.xul
extra : rebase_source : 44ab05088f70826c70dee3af30221e628ec1e4e8
2014-01-10 16:03:25 +13:00
Jamin Liu
6c1b84b456 Bug 953036 - Set HSP flag when BluetoothHfpManager chooses to connect HSP. r=echou 2014-01-10 08:23:13 -05:00
Ryan VanderMeulen
9fff18dc96 Backed out 5 changesets (bug 865407) for Windows crashes.
Backed out changeset d3e7f6392670 (bug 865407)
Backed out changeset 7ba94f08b7a5 (bug 865407)
Backed out changeset 3de6e32a4346 (bug 865407)
Backed out changeset 5c0572c6727b (bug 865407)
Backed out changeset 5db43cac79f5 (bug 865407)
2014-01-10 11:50:49 -05:00
Chris Peterson
1eddac7a94 Bug 956470 - Fix -Wuninitialized warning in ErrorResult.h. r=bz 2014-01-03 20:21:13 -08:00
Ben Tian
b09206d9f0 Bug 956258 - [cleanup] Patch 2/2: reduce warnings and remove cancel_discovery() in SendFile(), r=echou 2014-01-03 17:25:04 +08:00
Ben Tian
d395920253 Bug 956258 - [cleanup] Patch 1/2: rename g* variables to s* ones, r=echou 2014-01-10 09:34:43 +08:00
Vincent Chang
59fa16e1cd Bug 957572 - Wifi failed to Turn on after Wifi-Hotspot is turned on/off. r=chulee 2014-01-10 10:39:13 +08:00
Wes Kocher
a4abb45fc1 Merge m-c to b2g-inbound 2014-01-09 17:10:46 -08:00
Wes Kocher
1e0c835efd Merge b2g-inbound to m-c 2014-01-09 16:32:37 -08:00
Botond Ballo
7a65e32531 Bug 958254 - Remove an unnecessary (and harmful) assertion. r=ajones 2014-01-09 16:54:34 -05:00
Ryan VanderMeulen
f427c884c8 Backed out 6 changesets (bug 939294) for B2G bustage on a CLOSED TREE.
Backed out changeset 8c3aa9973da0 (bug 939294)
Backed out changeset 37098c13e59e (bug 939294)
Backed out changeset 7c9ade6c871c (bug 939294)
Backed out changeset fed59539afc1 (bug 939294)
Backed out changeset 89e9d3fa16fc (bug 939294)
Backed out changeset c97e58ebc5f4 (bug 939294)
2014-01-09 14:17:39 -05:00
Siddartha Pothapragada
a699c509fb Bug 933093 - Part 3: Add system message 'nfc-manager-send-file'. r=fabrice
This message is notified to system-process to initiate Bluetooth's send file operation.
2013-12-15 15:22:27 -08:00
Siddartha Pothapragada
73c0d4b415 Bug 933093 - Part 2: Add 'sendFile' implementation to Chrome process. r=yoshi
The chrome process is the arbitrator / mediator between the content process that issued the nfc 'sendFile' operation and the system-process (content) that is responsible for performing handover to an alternate carrier(AC).

The chrome process notifies the system process through a 'nfc-manager-send-file' system-message to initiate the handover process.

The system-process subsequently handovers the data to alternate carrier's (AC's : BT / WiFi) 'sendFile' interface.
2013-12-14 00:57:11 -08:00
Siddartha Pothapragada
08f0a3df68 Bug 933093 - Part 1: Add 'sendFile' interface to MozNFCPeer. r=khuey, sr=smaug 2013-12-13 23:24:02 -08:00
Fabrice Desré
8ee4f54361 Bug 940254 - Make "storage" permission in the database not grant "offline-app" r=gwagner 2014-01-08 17:14:22 -08:00
Carsten "Tomcat" Book
a0153adcc1 Merge mozilla-central to b2g-inbound 2014-01-09 13:05:34 +01:00
Carsten "Tomcat" Book
d3c320a5aa merge b2g-inbound to mozilla-central 2014-01-09 10:12:29 +01:00
Wes Kocher
f94698e85f Backed out changeset fe10dc4545c6 (bug 940254) for xpcshell bustage 2014-01-08 18:21:35 -08:00
Wes Kocher
585da55b7d Merge m-c to b2g-inbound 2014-01-08 18:16:31 -08:00
Fabrice Desré
1e0f7b7f32 Bug 940254 - Make "storage" permission in the database not grant "offline-app" r=gwagner 2014-01-08 17:14:22 -08:00
glacroix@mozilla.com
9995d5f1fc Bug 945366 - [Download API] Accessing error attribute at download start fires NS_ERROR_UNEXPECTED. Relanding because of bad merge. r=gwagner 2014-01-08 16:21:46 -08:00
Ryan VanderMeulen
2808193d74 Merge m-c to inbound. 2014-01-08 15:37:08 -05:00
Ryan VanderMeulen
edf7ab216b Backed out changesets d8a6bde76293 and 0b28eaf5bde9 (bug 956806) for suspicion of making OSX 10.6 debug mochitest-bc even more orange prone than usual. 2014-01-08 15:34:24 -05:00
Ryan VanderMeulen
0149e2e6ef Merge inbound to m-c. 2014-01-08 15:33:52 -05:00
Ryan VanderMeulen
de932f6cf4 Backed out changeset fd1fc08e3f58 (bug 948743) for B2G test failures. 2014-01-08 12:10:21 -05:00
Thomas Zimmermann
473a6d5afc Bug 950891: Don't run GetServiceChannel while turning Bluetooth on/off, r=echou
This patch adds a check to BluetoothDBusService::GetServiceChannel to
ensure that Bluetooth is ready. If the system is in a transition from
on to off, or vice versa, the method might operate on an undefined
state.
2014-01-07 13:46:20 +01:00
Shawn Huang
b769ea8f1c Bug 946240 - [Bluetooth][gonk-kk] Add flags to support different AVRCP profile version. r=echou 2014-01-08 09:32:19 -05:00
Carsten "Tomcat" Book
53106f8e55 Merge mozilla-central to b2g-inbound 2014-01-08 13:41:15 +01:00
Carsten "Tomcat" Book
bf625cfaf0 merge b2g-inbound to mozilla-central 2014-01-08 13:17:30 +01:00