Commit Graph

79 Commits

Author SHA1 Message Date
Yoshi Huang
fa829b146d Bug 1127726 - Cannot receive NDEF from another NFC Peer. r=vchang 2015-01-30 16:10:12 +08:00
Yoshi Huang
74b1e7b9aa Bug 1126653 - don't send nfc-manager-tech-lost if the foreground has received ontag/peerfound. r=dimi 2015-01-28 10:48:17 +08:00
Yoshi Huang
5a454bb99e Bug 1120315 - Part 3: notify tag/peerlost when lost focus. r=dimi
From 14b18a83041d65c0cf111d20279668e665dd0d56 Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js     |  3 +++
 dom/nfc/gonk/Nfc.js             | 24 ++++++++++++++++++++++--
 dom/nfc/gonk/nfc_consts.js      |  1 +
 dom/nfc/nsINfcContentHelper.idl | 10 +++++++++-
 dom/nfc/nsNfc.js                | 16 ++++++++++++++++
 5 files changed, 51 insertions(+), 3 deletions(-)
2015-01-26 18:58:52 +08:00
Yoshi Huang
be1546d4b7 Bug 1120315 - Part 2: s/change/changed/. r=dimi
From 86ab7fbe1d409c9f8f7082499179e0632101a61b Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js     | 4 ++--
 dom/nfc/gonk/Nfc.js             | 6 +++---
 dom/nfc/gonk/nfc_consts.js      | 2 +-
 dom/nfc/nsINfcContentHelper.idl | 4 ++--
 dom/nfc/nsNfc.js                | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
2015-01-26 18:13:36 +08:00
Yoshi Huang
dedd0b132a Bug 1082443 - B2G NFC: event fallback to System app if the foreground app cannot handle it. r=smaug, dimi 2014-12-11 17:42:35 +08:00
Dimi Lee
991978f0a9 Bug 1082440 - B2G NFC: Dispatch NFC events to foreground app. r=yoshi 2015-01-23 11:35:03 +08:00
Dimi Lee
af6dda2b28 Bug 1105666 - [BrowserAPI] Add an API to indicate this iframe could receive NFC event. r=smaug, kanru, yoshi 2015-01-22 17:40:17 +08:00
Yoshi Huang
37bc25da79 Bug 1093517 - remove impl for connect and close of MozNFCTag. r=dimi
From 8d41372b81f36efced2f46bfa8428eb12688ffd7 Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js        | 27 ++-------------------------
 dom/nfc/gonk/Nfc.js                | 12 +-----------
 dom/nfc/gonk/NfcGonkMessage.h      |  4 +---
 dom/nfc/gonk/NfcMessageHandler.cpp | 35 -----------------------------------
 dom/nfc/gonk/NfcMessageHandler.h   |  2 --
 dom/nfc/nsINfcContentHelper.idl    | 30 +-----------------------------
 6 files changed, 5 insertions(+), 105 deletions(-)
2015-01-15 15:41:43 +08:00
dlee
cf352f8410 Bug 1109456 - Support NFC tag transceive WebAPI. r=smaug, yoshi
---
 dom/nfc/NfcContentHelper.js        |   33 ++++++++++++++++++++++
 dom/nfc/gonk/Nfc.js                |    7 ++++-
 dom/nfc/gonk/NfcGonkMessage.h      |    2 ++
 dom/nfc/gonk/NfcMessageHandler.cpp |   54 ++++++++++++++++++++++++++++++++++++
 dom/nfc/gonk/NfcMessageHandler.h   |    4 ++-
 dom/nfc/gonk/NfcOptions.h          |   13 +++++++++
 dom/nfc/gonk/NfcService.cpp        |    6 ++++
 dom/nfc/nsINfcContentHelper.idl    |   27 ++++++++++++++++--
 dom/nfc/nsNfc.js                   |   19 +++++++++++++
 dom/webidl/MozNFCTag.webidl        |    6 ++++
 dom/webidl/NfcOptions.webidl       |    6 ++++
 11 files changed, 173 insertions(+), 4 deletions(-)
2015-01-09 10:42:48 +08:00
Yoshi Huang
15b00ac785 Bug 1115465 - Add id attribute to NFCTag. r=smaug, dimi
From 152d8835dedf6592d274478bac369530f98c3935 Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js        |  6 ++++--
 dom/nfc/gonk/NfcGonkMessage.h      |  2 +-
 dom/nfc/gonk/NfcMessageHandler.cpp | 17 +++++++++++------
 dom/nfc/gonk/NfcOptions.h          |  1 +
 dom/nfc/gonk/NfcService.cpp        |  5 +++++
 dom/nfc/nsINfcContentHelper.idl    |  4 +++-
 dom/nfc/nsNfc.js                   |  2 ++
 dom/webidl/MozNFCTag.webidl        |  5 +++++
 dom/webidl/NfcOptions.webidl       |  1 +
 9 files changed, 33 insertions(+), 10 deletions(-)
2014-12-26 16:07:45 +08:00
Yoshi Huang
bee6f691c0 Bug 1115674 - manifest for NfcContentHelper. r=dimi
From ab9028ed8fa698952fac33a0ce99fabb6bf906a7 Mon Sep 17 00:00:00 2001
---
 b2g/installer/package-manifest.in | 1 +
 dom/nfc/NfcContentHelper.manifest | 7 +++++++
 dom/nfc/gonk/Nfc.manifest         | 4 ----
 dom/nfc/moz.build                 | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 dom/nfc/NfcContentHelper.manifest
2014-12-26 20:41:25 +08:00
Yoshi Huang
081551b8ca 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
214d28576e 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
8b3b91e9a6 Merge mozilla-central to mozilla-inbound on a CLOSED TREE 2014-12-15 15:33:21 +01:00
Yoshi Huang
f369cf824d 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
b15507d889 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
783f92b732 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
ca3c178c12 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
d4a7bc83e9 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
a998b6a97f 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
957355818e 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
40186f9184 Bug 1103732 - remove getNFCPeer. r=smaug, dimi 2014-11-26 15:02:36 +08:00
Yoshi Huang
a95c871e12 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
Dimi Lee
b80d198868 Bug 1093483 - Remove NFC_GECKO_ERROR_NOT_ENABLED error from Nfc.js. r=allstars.chh 2014-11-27 17:02:56 +08:00
Dimi Lee
cc8a5d9601 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
de0386e48c 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
Yoshi Huang
2b44f38e20 Bug 1100285 - sessionId shouldn't be added in nfc-manager-send-file. r=dimi 2014-11-17 18:51:40 +08:00
Jonathan Hao
bf77055088 Bug 1086179 - Add a format API to MozNFCTag. r=smaug, allstars.chh 2014-11-18 09:52:39 +08:00
Yoshi Huang
c2c6ab4085 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
a15e4cbe9e 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
023b6b3743 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
4412933859 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
bbbec97ae1 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
7d5b114a42 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
269ed0bb36 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
a32aa09754 Bug 1090803 - rename makeReadOnlyNDEF to makeReadOnly in MozNFCTag. r=smaug, dimi 2014-10-31 14:51:41 +08:00
Yoshi Huang
8f899f9b3e 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
Yoshi Huang
3d69235c82 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
f8b8af1695 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
96a8f9b40e Bug 1003268 - [NFC] Implement onpeerfound. r=allstars.chh, r=smaug 2014-10-30 02:08:00 -04:00
Yoshi Huang
9598a835f6 Bug 991970 - Part 2: implement ontagfound/lost. r=smaug, dimi 2014-10-20 17:53:39 +08:00
Dimi Lee
847f723956 Bug 1083651 - [NFC] Remove unused error code. r=allstars.chh 2014-10-20 18:20:07 +08:00
Yoshi Huang
cfddfa035e Bug 1073421 - B2G NFC: remove NDEF_Formatable and NDEF_Writable. r=smaug, dimi 2014-10-15 15:47:42 +08:00
Yoshi Huang
0909bfcd23 Bug 1082452 - B2G NFC: Add a parameter 'isP2P' in WriteNDEF request. r=smaug, dimi 2014-10-15 11:54:09 +08:00
Dimi Lee
0f41549559 Bug 1058440 - B2G NFC: enable debug when NFC debug is enabled. r=allstars.chh 2014-10-14 16:37:50 +08:00
Yoshi Huang
3d3666df7a Bug 1074778 - B2G NFC: typo for msg in removeEventTarget. r=vchang 2014-09-30 19:23:08 +08:00
Yoshi Huang
a7273b3381 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
410a14b52c Bug 1069177 - B2G NFC: rename nsINFCPeerEventListener to nsINfcDOMEventTarget. r=dimi 2014-09-24 14:52:04 +08:00
Yoshi Huang
e1058e3d71 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
6b66ccbb04 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