Commit Graph

235 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
beeb584af9 Merge mozilla-central to mozilla-inbound on a CLOSED TREE 2014-12-15 15:33:21 +01:00
Yoshi Huang
972ef51e6f Bug 1111480 - isP2P exists in every response. r=dimi
From 961e2572cf82fdb1ce2b7df912d56d3c1f6df2bd Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/NfcOptions.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
2014-12-15 15:28:23 +08:00
Yoshi Huang
a19f4a0d84 Bug 1109458 - Let privilege App know if NFC is enabled or not. r=smaug, dimi 2014-12-12 15:13:40 +08:00
Botond Ballo
b273018bde Bug 1073081 - Fix warnings about macro redefinitions by renaming macros. r=ehsan
--HG--
extra : source : 18294144de5ff84e3a88945f7222e6eb8bbfcb34
2014-12-10 18:20:10 -05:00
Botond Ballo
8296035077 Bug 1073081 - Fix -Wunused-result, -Wunused-variable, and -Wunused-but-set-variable warnings. r=ehsan
--HG--
extra : source : a1ac7acfcf14207706eca29be3a20c576c8fae06
2014-11-26 18:13:49 -05:00
Yoshi Huang
aeb9d94711 Bug 1110059 - IDL for NFC system message. r=dimi
From 774da50e697c2d194146d1f0ff748aa6f31fe8dc Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js                  | 36 ++++++++++++++++++++++++++++++++++--
 dom/nfc/gonk/nsINfcSystemMessage.idl | 25 +++++++++++++++++++++++++
 dom/nfc/moz.build                    |  1 +
 3 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 dom/nfc/gonk/nsINfcSystemMessage.idl
2014-12-11 18:53:27 +08:00
Yoshi Huang
ce073c1669 Bug 1108996 - using isP2P in NFCTechDiscoveredWrapper. r=dimi
From 677658217f206423c7f07be926e0e9f28d9b37e6 Mon Sep 17 00:00:00 2001
---
 dom/nfc/nsNfc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
2014-12-09 18:51:29 +08:00
Yoshi Huang
b5bf4a5cc1 Bug 1108005 - Move NFC IPC messages and permission together. r=dimi
From 76b3d82105390ca821df0264e4a7f914950019d2 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js | 115 ++++++++++++++++++----------------------------------
 1 file changed, 40 insertions(+), 75 deletions(-)
2014-12-09 18:56:40 +08:00
Dimi Lee
0846eb7b58 Bug 1082300 - B2G NFC: remove NDEF and P2P from technology list. r=smaug, allstars.chh 2014-12-05 01:38:38 +08:00
Yoshi Huang
1a9fe93e27 Bug 1103732 - Part 2: update test cases. r=dimi
From abdfb00788f359f4ed9bbd502a7e723350e3212d Mon Sep 17 00:00:00 2001
---
 dom/nfc/tests/marionette/test_nfc_peer.js          | 16 ++--------------
 dom/nfc/tests/marionette/test_nfc_peer_sendFile.js |  3 +--
 dom/nfc/tests/marionette/test_nfc_peer_sendndef.js |  5 ++---
 3 files changed, 5 insertions(+), 19 deletions(-)
2014-11-27 15:05:29 +08:00
Yoshi Huang
3a5eafb895 Bug 1103732 - remove getNFCPeer. r=smaug, dimi 2014-11-26 15:02:36 +08:00
Yoshi Huang
c1509da309 Bug 1048676 - Part 2: Nfc.js and test case change. r=dimi
From 609631024dbcf07d74c13b15ce201b499e6176dd Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js                                | 30 +++++++++++-----------
 .../marionette/test_nfc_checkP2PRegistration.js    |  4 +--
 .../tests/marionette/test_nfc_error_messages.js    |  4 +--
 dom/nfc/tests/marionette/test_nfc_peer.js          |  4 ++-
 4 files changed, 22 insertions(+), 20 deletions(-)
2014-11-06 11:21:07 +08:00
Yoshi Huang
b8f4b31669 Bug 1048676 - Part 1: WebIDL and DOM change. r=smaug, dimi
From 28e46b34f04d20d5f10c14a85e77ec1ac98aad9e Mon Sep 17 00:00:00 2001
---
 dom/apps/PermissionsTable.jsm     | 9 +++++++--
 dom/nfc/nsNfc.js                  | 9 +++++----
 dom/webidl/MozNFC.webidl          | 8 ++------
 dom/webidl/MozNFCPeer.webidl      | 2 +-
 dom/webidl/MozNFCPeerEvent.webidl | 2 +-
 dom/webidl/MozNFCTagEvent.webidl  | 2 +-
 6 files changed, 17 insertions(+), 15 deletions(-)
2014-11-06 11:12:38 +08:00
Dimi Lee
ced9fc55e8 Bug 1093483 - Remove NFC_GECKO_ERROR_NOT_ENABLED error from Nfc.js. r=allstars.chh 2014-11-27 17:02:56 +08:00
Yoshi Huang
ec468b8fc1 Bug 1103730 - Create a nfc-manager-tech-discovered system message. r=dimi 2014-11-17 18:00:14 +08:00
Yoshi Huang
b64edd026f Bug 1103729 - Create nfc-manager-send-file wrapper. r=dimi 2014-11-17 17:41:18 +08:00
Dimi Lee
1a4a4bc5e0 Bug 1095322 - Child process should know current rf state of NFC HW. r=allstars.chh 2014-11-25 15:10:34 +08:00
Yoshi Huang
ebbdd49940 Bug 1085296 - B2G NFC: enable debug when either flag is enabled or settings is enabled. r=dimi 2014-11-24 10:10:32 +08:00
Dimi Lee
92790a6045 Bug 996397 - B2G NFC: Replace DOMRequests with Promises. r=smaug, allstars.chh 2014-11-21 17:54:04 +08:00
Yoshi Huang
0282ce8669 Bug 1082445: B2G NFC: notifiy peer/taglost when app goes to background. r=smaug, dimi 2014-11-19 12:32:47 +08:00
Yoshi Huang
087c7db00c Bug 1097527 - ontag/peerlost shouldn't be fired if App doesn't listen/receive ontag/peerfound. r=smaug, dimi 2014-11-19 11:00:16 +08:00
Yoshi Huang
6c38471fac Bug 1100285 - sessionId shouldn't be added in nfc-manager-send-file. r=dimi 2014-11-17 18:51:40 +08:00
Jonathan Hao
801c5023ea Bug 1086179 - Add a format API to MozNFCTag. r=smaug, allstars.chh 2014-11-18 09:52:39 +08:00
Yoshi Huang
3e9f3409fd Bug 1098975 - sessionToken is missing in _createNFCPeer in nsNfc.js. r=dimi 2014-11-14 16:03:16 +08:00
Yoshi Huang
716f29e7b4 Bug 1098253 - get rfState from nfcd. r=dimi
From 2c8fd495054e6bd3bd93561e20518a47f6f6bc64 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/NfcGonkMessage.h      | 2 +-
 dom/nfc/gonk/NfcMessageHandler.cpp | 5 +----
 dom/nfc/gonk/NfcMessageHandler.h   | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)
2014-11-13 19:20:37 +08:00
Yoshi Huang
03fb2771fd Bug 1096897 - Part 2: change power to changeRFState. r=dimi
From 4ca465353c1c5bd5bc08f40195ad66cc1c407549 Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js        | 30 ++++++------------------------
 dom/nfc/gonk/Nfc.js                | 26 ++++++--------------------
 dom/nfc/gonk/NfcGonkMessage.h      |  4 ++--
 dom/nfc/gonk/NfcMessageHandler.cpp | 20 ++++++++++----------
 dom/nfc/gonk/NfcMessageHandler.h   |  4 ++--
 dom/nfc/nsINfcContentHelper.idl    | 21 +++++----------------
 dom/nfc/nsNfc.js                   | 13 ++++++++++---
 7 files changed, 41 insertions(+), 77 deletions(-)
2014-11-12 10:13:33 +08:00
Yoshi Huang
869037482d Bug 1096897 - Part 1: s/powerLevel/rfState/g. r=smaug, dimi
From b9ec1a996afb8d50d014e3e479a7c767df2555ac Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js                | 14 +++++++-------
 dom/nfc/gonk/NfcMessageHandler.cpp | 10 +++++-----
 dom/nfc/gonk/NfcMessageHandler.h   |  2 +-
 dom/nfc/gonk/NfcOptions.h          | 18 +++++++++---------
 dom/nfc/gonk/NfcService.cpp        |  8 +++++++-
 dom/nfc/gonk/nfc_consts.js         |  8 +++-----
 dom/webidl/NfcOptions.webidl       | 10 ++++++++--
 7 files changed, 40 insertions(+), 30 deletions(-)
2014-11-11 19:19:52 +08:00
Yoshi Huang
40974d05e0 Bug 1097442 - Part 2: rename nsINfcEventListener. r=dimi
From f2abd94c7d0c1f79c55b813bcd32a1b2761949d1 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js             | 2 +-
 dom/nfc/gonk/NfcService.cpp     | 2 +-
 dom/nfc/gonk/NfcService.h       | 2 +-
 dom/nfc/gonk/nsINfcService.idl  | 8 ++++----
 dom/nfc/nsINfcContentHelper.idl | 6 +++---
 dom/nfc/nsNfc.js                | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
2014-11-12 11:22:36 +08:00
Yoshi Huang
7b50cbd594 Bug 1097442 - Part 1: rename eventTarget to eventListener. r=dimi
From 3e4d4deffb10f715e03725700d4078aa98cc1803 Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js     | 18 +++++++++---------
 dom/nfc/gonk/Nfc.js             | 28 ++++++++++++++--------------
 dom/nfc/nsINfcContentHelper.idl | 13 +++++++------
 dom/nfc/nsNfc.js                |  4 ++--
 4 files changed, 32 insertions(+), 31 deletions(-)
2014-11-12 10:26:09 +08:00
Yoshi Huang
e515bfb51f Bug 1087925 - calling some NFCTag API should throw if the condition is not met. r=smaug, dimi 2014-11-05 17:43:54 +08:00
Yoshi Huang
a76656b90f Bug 1094669 - Add a size attribute for MozNDEFRecord. r=smaug, dimi
From 2f518e162998b4ac911b3e10f8a7f8177fe03f59 Mon Sep 17 00:00:00 2001
---
 dom/nfc/MozNDEFRecord.cpp       | 7 +++++++
 dom/nfc/MozNDEFRecord.h         | 6 ++++++
 dom/webidl/MozNDEFRecord.webidl | 6 ++++++
 3 files changed, 19 insertions(+)
2014-11-07 14:24:34 +08:00
Yoshi Huang
0742f73807 Bug 1055460 - replace config request with power request. r=dimi
From 2860c6c7d3783e0f7cf71bcaacbc324dc288c8af Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js        |  4 ++--
 dom/nfc/gonk/Nfc.js                | 18 +++++++-----------
 dom/nfc/gonk/NfcGonkMessage.h      |  6 +++---
 dom/nfc/gonk/NfcMessageHandler.cpp | 20 ++++++++++----------
 dom/nfc/gonk/NfcMessageHandler.h   |  4 ++--
 5 files changed, 24 insertions(+), 28 deletions(-)
2014-11-06 17:57:49 +08:00
Yoshi Huang
5182b1a338 Bug 1085301 - B2G NFC: Don't check sessionToken in notifyPeerFound. r=dimi 2014-11-05 11:09:37 +08:00
Yoshi Huang
6e99c80f86 Bug 978707 : update checkSessionToken. r=dimi
From da437d03c648c33cd168db21ed5ef95eaab07da3 Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js     |  5 +++--
 dom/nfc/gonk/Nfc.js             | 21 +++++++--------------
 dom/nfc/gonk/nfc_consts.js      |  4 ++--
 dom/nfc/nsINfcContentHelper.idl |  4 ++--
 dom/nfc/nsNfc.js                |  2 +-
 5 files changed, 15 insertions(+), 21 deletions(-)
2014-11-04 17:29:26 +08:00
Yoshi Huang
ed730e5c61 Bug 1090803 - rename makeReadOnlyNDEF to makeReadOnly in MozNFCTag. r=smaug, dimi 2014-10-31 14:51:41 +08:00
Yoshi Huang
517366980a Bug 1085292 - invalidate the object once ontag/peerlost is called. r=smaug, dimi 2014-10-29 11:15:11 +08:00
Yoshi Huang
ee5b2cd06e Bug 1051754 - B2G NFC: Add marionette test for peer.sendFile. r=dimi
From 3cfb06874b6e838ad76e1817c7b69df81e0f802b Mon Sep 17 00:00:00 2001
---
 dom/nfc/tests/marionette/head.js                   | 20 +++++++--
 dom/nfc/tests/marionette/manifest.ini              |  1 +
 dom/nfc/tests/marionette/test_nfc_peer_sendFile.js | 49 ++++++++++++++++++++++
 3 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 dom/nfc/tests/marionette/test_nfc_peer_sendFile.js
2014-08-11 18:26:52 +08:00
Yoshi Huang
0958389603 Bug 1093485 - typo for NotifySendFileStatus in Nfc.js. r=dimi.
From e9190c7fef01cab0e09aaa303a5b4db117ce7a37 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
2014-11-04 15:59:24 +08:00
Krzysztof Mioduszewski
0d32f9acac Bug 1073014 - Part 3: Add xpcshell tests for HCIEventTransactionSystemMessageConfigurator. r=allstars.chh 2014-11-04 03:35:00 -05:00
Krzysztof Mioduszewski
de74468807 Bug 1073014 - Part 2: Use message.origin property to get secure element name. r=allstars.chh 2014-11-04 03:14:00 -05:00
Krzysztof Mioduszewski
0e0c03d0ec Bug 1073014 - Part 1: Using Promise constructor instead of Promise.defer in HCIEventTransactionSystemMessageConfigurator. r=allstars.chh 2014-11-04 03:05:00 -05:00
Yoshi Huang
7268b2051d Bug 1089558 - Add 'Impl' for objects defined in nsNfc.js. r=dimi
From 5d02c407d6322d79f086b66d61ffc208f4b1213c Mon Sep 17 00:00:00 2001
---
 dom/nfc/nsNfc.js | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)
2014-10-27 17:58:24 +08:00
Yoshi Huang
2b650bafcc Bug 1074611 - pass NDEF info to Content. r=smaug, dimi.
From 03c850ef46ffd4baeb84596fa219e39788eb0571 Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js        | 19 ++++++++++++++---
 dom/nfc/gonk/NfcGonkMessage.h      |  9 --------
 dom/nfc/gonk/NfcMessageHandler.cpp |  8 +++----
 dom/nfc/gonk/NfcOptions.h          | 10 +++++----
 dom/nfc/gonk/NfcService.cpp        |  9 ++++++--
 dom/nfc/nsINfcContentHelper.idl    | 11 +++++++++-
 dom/nfc/nsNfc.js                   | 28 +++++++++++++++++++++----
 dom/webidl/MozNFCTag.webidl        | 43 ++++++++++++++++++++++++++++++++++++++
 dom/webidl/NfcOptions.webidl       |  5 +++--
 9 files changed, 113 insertions(+), 29 deletions(-)
2014-10-22 11:48:40 +08:00
Dimi Lee
5f106fa32d Bug 1047233 - B2G NFC: handler the errorMsg in NfcService and list errorMsg in WebIDL. r=smaug, allstars.chh 2014-11-03 19:38:33 +08:00
Krzysztof Mioduszewski
0bae9eb769 Bug 1003268 - [NFC] Implement onpeerfound. r=allstars.chh, r=smaug 2014-10-30 02:08:00 -04:00
Dimi Lee
05cedd6149 Bug 1086209 - [NFC] Remove window parameter for NfcContentHelper API. r=allstars.chh 2014-10-30 18:46:41 +08:00
Yoshi Huang
a2a25825b0 Bug 1087931 - Remove mozNfc.getNFCTag. r=smaug, dimi
From 59396995908ed8a7227dd2b62b07aad0e16e88dc Mon Sep 17 00:00:00 2001
---
 dom/nfc/nsNfc.js                          |  8 --------
 dom/nfc/tests/marionette/test_nfc_peer.js | 15 +--------------
 dom/webidl/MozNFC.webidl                  |  5 -----
 3 files changed, 1 insertion(+), 27 deletions(-)
2014-10-23 18:36:10 +08:00
Yoshi Huang
9ce3e8090c Bug 991970 - Part 3: add permission check. r=smaug
From 6462cdf51f04b81479932f1b7b1d809970820620 Mon Sep 17 00:00:00 2001
---
 dom/nfc/nsNfc.js         | 23 +++++++++++++++++++++++
 dom/webidl/MozNFC.webidl |  1 +
 2 files changed, 24 insertions(+)
2014-10-28 14:58:47 +08:00
Yoshi Huang
3361c10397 Bug 991970 - Part 2: implement ontagfound/lost. r=smaug, dimi 2014-10-20 17:53:39 +08:00
Yoshi Huang
97dec8a6f9 Bug 1087861 - Remove initialize() from MozNFCTag and MozNFCPeer. r=dlee 2014-10-23 12:19:22 +08:00
Dimi Lee
302100aa47 Bug 1083651 - [NFC] Remove unused error code. r=allstars.chh 2014-10-20 18:20:07 +08:00
Yoshi Huang
1842c74895 Bug 1073421 - B2G NFC: remove NDEF_Formatable and NDEF_Writable. r=smaug, dimi 2014-10-15 15:47:42 +08:00
Yoshi Huang
b6744ba68f Bug 1082452 - B2G NFC: Add a parameter 'isP2P' in WriteNDEF request. r=smaug, dimi 2014-10-15 11:54:09 +08:00
Dimi Lee
53190d1c98 Bug 1058440 - B2G NFC: enable debug when NFC debug is enabled. r=allstars.chh 2014-10-14 16:37:50 +08:00
Peter Van der Beken
9254096129 Bug 1078744 - Replace SetIsDOMBinding with SetIsNonDOMBinding, remove nsWrapperCache::SetIsDOMBinding. r=bz.
--HG--
extra : rebase_source : 89c476cd9436530b2df5acc903909e34188417a0
2014-10-07 11:44:49 +02:00
Yoshi Huang
41c684af6e Bug 1074778 - B2G NFC: typo for msg in removeEventTarget. r=vchang 2014-09-30 19:23:08 +08:00
Yoshi Huang
9188583e5f Bug 1073416 - B2G NFC: remove getDetailsNDEF impl. r=dimi
From 59914a177ef8efdf569829fd46cbdd5659517bc6 Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js        | 41 --------------------------------------
 dom/nfc/gonk/Nfc.js                |  5 -----
 dom/nfc/gonk/NfcGonkMessage.h      |  4 +---
 dom/nfc/gonk/NfcMessageHandler.cpp | 36 ---------------------------------
 dom/nfc/gonk/NfcMessageHandler.h   |  2 --
 dom/nfc/nsINfcContentHelper.idl    |  3 +--
 6 files changed, 2 insertions(+), 89 deletions(-)
2014-09-26 17:59:36 +08:00
Yoshi Huang
2ec59f6b64 Bug 1069177 - B2G NFC: rename nsINFCPeerEventListener to nsINfcDOMEventTarget. r=dimi 2014-09-24 14:52:04 +08:00
Ehsan Akhgari
080e94906d Bug 1072701 - Build some Firefox OS specific DOM code in unified mode; r=baku
--HG--
extra : rebase_source : 4a8812c18341c9851fb3265e1f8e6c77a95911c5
2014-09-25 10:10:42 -04:00
Yoshi Huang
406361cf5c Bug 1058490 - B2G NFC: Add a sessionHelper in Chrome Process. r=dimi
From ac82ed58d645749aafbeb94741c87d27b4eed558 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js | 131 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 87 insertions(+), 44 deletions(-)
2014-09-23 18:33:08 +08:00
Yoshi Huang
0e2055201f Bug 1066570 - b2g NFC uninitialized memory bug. r=dimi
From 1ffa3080ca8b3ac70564734cd02cae72fddf730c Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/NfcMessageHandler.cpp | 3 +++
 1 file changed, 3 insertions(+)
2014-09-23 12:50:21 +08:00
dlee
64402e267b Bug 1061512 - [NFC] nfcd should notify gecko about NDEF information. r=allstars.chh 2014-09-23 18:53:41 +08:00
Krzysztof Mioduszewski
d01db6c7a6 Bug 1063525 - Remove getEventType method from nsNfc.js. r=allstars.chh 2014-09-09 05:56:00 -04:00
Garner Lee
37e9fe9e5b Bug 1062672 - B2G NFC: Typo for 'ESE' in HCI Event origin. r=allstars.chh 2014-09-08 15:15:00 -04:00
Yoshi Huang
2be5b63f29 Bug 1007724 - Part 2: marionette tests. r=dimi
From 84c328a6b61db42daa196f18e0f4113e1b74b2e8 Mon Sep 17 00:00:00 2001
---
 dom/nfc/tests/marionette/test_ndef.js | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
2014-08-29 14:28:12 +08:00
Yoshi Huang
5ed0bc7608 Bug 1007724 - Part 1: tnf validation. r=smaug
From 5289124d435e3eed280c8a1728b55ab005ac0aae Mon Sep 17 00:00:00 2001
---
 dom/nfc/MozNDEFRecord.cpp | 40 ++++++++++++++++++++++++++++++++++++++++
 dom/nfc/MozNDEFRecord.h   |  3 +++
 2 files changed, 43 insertions(+)
2014-08-28 16:44:48 +08:00
Yoshi Huang
16d550eb01 Bug 1055560 - Part 3: Update tests. r=dimi
From 29bd27dc7ebcbc0ec4cce0681fa956eed7fad6ea Mon Sep 17 00:00:00 2001
---
 dom/nfc/tests/marionette/head.js                    | 21 +++++++++++++++++----
 dom/nfc/tests/marionette/test_ndef.js               |  2 +-
 dom/nfc/tests/marionette/test_nfc_error_messages.js |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)
2014-08-21 12:03:13 +08:00
Yoshi Huang
f62d93c3d3 Bug 1055560 - Part 2: NfcService changes. r=smaug 2014-08-20 19:50:29 +08:00
Yoshi Huang
538d421280 Bug 1055560 - Part 1: DOM Change. r=smaug 2014-08-20 17:35:18 +08:00
Thomas Zimmermann
ae2de4ebb8 Bug 1059813: Use getter/setter methods of |UnixSocketRawData| in NFC helpers, r=allstars.chh 2014-09-08 11:44:01 +02:00
Krzysztof Mioduszewski
eb5be27202 Bug 1061827 - Nfc.js serializes all the messages, even in release mode. r=allstars.chh 2014-09-05 00:21:00 -04:00
Yoshi Huang
50a7af741f Bug 1053732 - Part 3: Update Impl and tests. r=dimi 2014-08-19 17:40:07 +08:00
Yoshi Huang
e72b40b273 Bug 1053732 - Part 2: update NfcService. r=smaug 2014-08-18 17:31:18 +08:00
Yoshi Huang
5453f1e174 Bug 1053732 - Part 1: DOM changes. r=smaug 2014-08-18 14:56:12 +08:00
Yoshi Huang
95362d1304 Bug 1055960 - Part 3: fix tests cases. r=dimi
From d6d188a78006b291f7cdd8b4a910a9b5a39b7da2 Mon Sep 17 00:00:00 2001
---
 .../tests/marionette/test_nfc_error_messages.js    | 36 +++++-----------------
 1 file changed, 8 insertions(+), 28 deletions(-)
2014-09-02 19:27:56 +08:00
Yoshi Huang
8417488ffc Bug 1055960 - Part 2: Add removeTarget. r=dimi
From eab988a41dcd2514c8f80703588f379e346de2cf Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js | 9 +++++++++
 1 file changed, 9 insertions(+)
2014-09-01 13:59:12 +08:00
Yoshi Huang
88ea45537d Bug 1055960 - Part 1: fix onpeerlost. r=dimi 2014-08-29 16:44:16 +08:00
Yoshi Huang
8822bc7aa8 Bug 1059168 - B2G NFC: Make sure the techList and origin string won't overflow. r=smaug 2014-09-03 18:09:43 +08:00
Yoshi Huang
a2b2f9059c Bug 1059102 - Part 3: s/json/data/g. r=dimi 2014-08-27 16:32:22 +08:00
Yoshi Huang
b004479586 Bug 1059102 - Part 2: rename msg[name] to message. r=dimi
From 31016145026b17657dc8d2e22f2953b35204b0fc Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js | 110 ++++++++++++++++++++++++++--------------------------
 1 file changed, 55 insertions(+), 55 deletions(-)
2014-08-27 16:31:06 +08:00
Yoshi Huang
a9d6f58176 Bug 1059102 - Part 1: add logging. r=dimi
From 7a4444b112e42c58b1afdf439663de47e4ab43ac Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
2014-08-27 16:25:33 +08:00
Garner Lee
8d3f4d2a4a Bug 979767 - Part 2: NFC and Gonk. Supporting web application triggering based on HCI event EVT_TRANSACTION. r=allstars.chh r=smaug 2014-08-27 14:21:00 +02:00
Garner Lee
ddbbc6e53d Bug 979767 - Part 1: Messages and Permissions. Supporting web application triggering based on HCI event EVT_TRANSACTION. r=fabrice 2014-08-27 14:41:00 +02:00
Yoshi Huang
2c6b526e6b Bug 964194 - B2G NFC: Remove NFCTag.getDetailsNDEF(). r=smaug, r=dimi 2014-08-22 01:51:00 -04:00
Yoshi Huang
ad683a630b Bug 963541 - B2G NFC: Remove NFCTag.connect and NFCTag.close. r=smaug, r=dimi 2014-08-27 05:13:00 -04:00
Yoshi Huang
001a9fdfcb Bug 1057258 - B2G NFC: Remove unused consts in nfc_consts.js. r=dimi
--HG--
extra : rebase_source : 0f81971a32cef8448d33b23cd55108405d7dbc9d
2014-08-22 01:09:00 -04:00
Aryeh Gregor
15ec3ba67b Bug 1053190 - Reduce unnecessary inclusion of nsINode.h in headers; r=ehsan 2014-08-18 17:44:50 +03:00
Yoshi Huang
95dabbf0ba Bug 1054217 - Part 4: Refine Nfc.receiveMessage. r=dimi
From 68d1ccd5d2e0e0f85803e56741ae17ff89c4a2a7 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js | 61 ++++++++++++++++++++++++-----------------------------
 1 file changed, 28 insertions(+), 33 deletions(-)
2014-08-15 17:25:57 +08:00
Yoshi Huang
76ed9bc551 Bug 1054217 - part 3: rename setSessionToken to checkSessionToken. r=dimi 2014-08-18 17:43:28 +08:00
Yoshi Huang
d7ac11ec33 Bug 1054217 - part 2: remove targetsBySessionTokens. r=dimi
From 07ca796ae9e1d8f98d8282c2bc4f68046d311fde Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js        | 124 ++++++++++-----------------------------------
 dom/nfc/gonk/nfc_consts.js |   2 +
 2 files changed, 29 insertions(+), 97 deletions(-)
2014-08-15 16:29:55 +08:00
Yoshi Huang
28d58b9bb7 Bug 1054217 - Part 1: Add onPeerLost in gMessageManager. r=dimi
From 1e81ab61d3ff409817415b5e8b610f77461836f8 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)
2014-08-15 11:31:52 +08:00
Yoshi Huang
608021a46f Bug 1054119 - B2G NFC: Don't process data from nfcd if error. r=dimi 2014-08-13 18:12:27 +08:00
Ed Morley
000d251175 Merge latest green b2g-inbound changeset and mozilla-central; a=merge 2014-08-15 16:54:17 +01:00
Yoshi Huang
5abc967016 Bug 1053116 - Part 2: add error code in NfcGonkMessages.h. r=dimi 2014-08-15 10:04:51 +08:00
Yoshi Huang
5806e79929 Bug 1053116 - Part 1: update error code in nfc_consts.js. r=dimi 2014-08-15 10:02:01 +08:00
Yoshi Huang
ae558038c0 Bug 1046554 - Part 2: update marionette tests. r=dimi
From d7dafea4dcff00edbe40ee0880ca71b804893622 Mon Sep 17 00:00:00 2001
---
 .../tests/marionette/test_nfc_error_messages.js    | 43 +---------------------
 dom/nfc/tests/marionette/test_nfc_peer.js          | 20 ++++++++--
 2 files changed, 17 insertions(+), 46 deletions(-)
2014-08-11 17:03:52 +08:00
Yoshi Huang
7694e3e977 Bug 1046554 - Part 1: B2G NFC: pass NFCPeerEvent in onpeerready. r=smaug, dimi 2014-07-31 17:11:04 +08:00
Ed Morley
8e433ac98d Backed out changeset 52fc270e59ad (bug 1051754) for intermittent test failures 2014-08-14 17:40:04 +01:00
Garner Lee
f61c289d4c Bug 1050577: [NFC] Techlost not clearing peer appId correctly. r=allstars.chh 2014-08-11 16:03:35 -07:00
Yoshi Huang
f28c154070 Bug 1052311 - B2G NFC: remove warnings from Nfc.js and NfcContentHelper.js. r=dimi 2014-08-12 17:04:51 +08:00