Commit Graph

187 Commits

Author SHA1 Message Date
Yoshi Huang
d01e495b3c Bug 1111523 - isP2P and sessionToken shouldn't exist in nfc-manager-tech-discover wrapper. r=dimi 2014-12-15 18:01:34 +08:00
Yoshi Huang
acfdd2727f Bug 1111528 - onpeerfound shouldn't be called when receiving NDEF from another peer. r=dimi 2014-12-15 18:19:25 +08:00
Carsten "Tomcat" Book
bad074f263 Merge mozilla-central to mozilla-inbound on a CLOSED TREE 2014-12-15 15:33:21 +01:00
Yoshi Huang
2d9fedee55 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
9b2e796b7c 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
449bab4daf 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
870235958c 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
019231d273 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
cfbd984cd3 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
ffb0bc5267 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
6dcfe58782 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
0baa955618 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
1e4ab4c8f8 Bug 1103732 - remove getNFCPeer. r=smaug, dimi 2014-11-26 15:02:36 +08:00
Yoshi Huang
7d462fac68 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
215cbc771b 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
9d7b247d38 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
7b3f960904 Bug 1103730 - Create a nfc-manager-tech-discovered system message. r=dimi 2014-11-17 18:00:14 +08:00
Yoshi Huang
95e6c95056 Bug 1103729 - Create nfc-manager-send-file wrapper. r=dimi 2014-11-17 17:41:18 +08:00
Dimi Lee
47ce7a8a57 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
98d7ceef14 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
889cfd218e Bug 996397 - B2G NFC: Replace DOMRequests with Promises. r=smaug, allstars.chh 2014-11-21 17:54:04 +08:00
Yoshi Huang
7497ee7a95 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
d48625d613 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
6f58df1cee Bug 1100285 - sessionId shouldn't be added in nfc-manager-send-file. r=dimi 2014-11-17 18:51:40 +08:00
Jonathan Hao
c57d2071c2 Bug 1086179 - Add a format API to MozNFCTag. r=smaug, allstars.chh 2014-11-18 09:52:39 +08:00
Yoshi Huang
2fb937a8ba Bug 1098975 - sessionToken is missing in _createNFCPeer in nsNfc.js. r=dimi 2014-11-14 16:03:16 +08:00
Yoshi Huang
65bd5d6b15 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
51445b181a 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
237e4a7bc6 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
974b6f055e 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
4d754498a8 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
3ea6f7d232 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
df0810a717 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
fab2c29426 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
6522c9ac46 Bug 1085301 - B2G NFC: Don't check sessionToken in notifyPeerFound. r=dimi 2014-11-05 11:09:37 +08:00
Yoshi Huang
9fa6a39648 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
e0d3a4b820 Bug 1090803 - rename makeReadOnlyNDEF to makeReadOnly in MozNFCTag. r=smaug, dimi 2014-10-31 14:51:41 +08:00
Yoshi Huang
a3372e10aa Bug 1085292 - invalidate the object once ontag/peerlost is called. r=smaug, dimi 2014-10-29 11:15:11 +08:00
Yoshi Huang
aaf5ea2704 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
60bc7c7efa 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
91b3439573 Bug 1073014 - Part 3: Add xpcshell tests for HCIEventTransactionSystemMessageConfigurator. r=allstars.chh 2014-11-04 03:35:00 -05:00
Krzysztof Mioduszewski
f50dec706c 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
0f442eff03 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
df4fb725c9 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
69f5a862bf 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
1e51c8bed6 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
ae9ea5239b Bug 1003268 - [NFC] Implement onpeerfound. r=allstars.chh, r=smaug 2014-10-30 02:08:00 -04:00
Dimi Lee
41c2533bd5 Bug 1086209 - [NFC] Remove window parameter for NfcContentHelper API. r=allstars.chh 2014-10-30 18:46:41 +08:00
Yoshi Huang
c4f0c21bfa 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
4fbdd95cf7 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