Commit Graph

94 Commits

Author SHA1 Message Date
Andrea Marchesini
b212600c95 Bug 1148527 - Indentation fix after bug 1145631, r=ehsan 2015-03-27 18:52:19 +00:00
Ehsan Akhgari
33bb32f549 Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj
This patch was automatically generated using the following script:

function convert() {
echo "Converting $1 to $2..."
find . \
       ! -wholename "*/.git*" \
       ! -wholename "obj-ff-dbg*" \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert MOZ_OVERRIDE override
convert MOZ_FINAL final
2015-03-21 12:28:04 -04:00
Thomas Zimmermann
2b228f8626 Bug 1109592 - Listen for connections from NFC daemon. r=allstars.chh
This patch inverses the connection setup procedure between Gecko
and nfcd. Gecko now installs a listen socket and starts nfcd from
the init scripts. Nfcd establishes the connection by connecting
to Gecko's socket.

As a side effect of this patch, nfcd only runs while NFC is switched
on. This saves ~1.6 MiB os memory with contemporary NFC drivers on
flame-kk.
2015-03-11 03:38:00 -04:00
Thomas Zimmermann
3f04f600c1 Bug 1109592 - Forward socket state from |NfcSocketListener|. r=allstars.chh
This patch allows to handle changes to the socket state at a higher
level than |NfcSocketListener|.
2015-03-09 03:27:00 -04:00
Thomas Zimmermann
4365986c1d Bug 1109592 - Only open connection to nfcd while NFC is switched on. r=allstars.chh
With this patch Gecko only creates a connection to nfcd while NFC is
switched on, and closes the connection after NFC has been switched off.

While the connection is being opened, commands to nfcd are held in a
waiting queue. Gecko flushes the queue after it connected successfully
to nfcd.

As a side effect of this patch, the NFC thread only exists while NFC
is switched on.
2015-03-12 07:43:00 -04:00
Yoshi Huang
e78f29ee9c Bug 1141457 - Part 3: add a CommandMsgTable. r=dimi
From 7650a8e6a0ab634b90c85c0fa85a096e7d0f4ec9 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)
2015-03-10 17:06:56 +08:00
Yoshi Huang
a24e6525de Bug 1141457 - Part 2: add isP2P for writeNDEF. r=dimi
From 35af6fe22fa075ecef92cd84e2ce22357c9c395f Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js     | 5 +++--
 dom/nfc/gonk/Nfc.js             | 1 -
 dom/nfc/nsINfcContentHelper.idl | 5 ++++-
 dom/nfc/nsNfc.js                | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)
2015-03-10 16:49:08 +08:00
Yoshi Huang
9a3417e8f9 Bug 1141457 - Part 1: Move SendFile to gMessageManager. r=dimi
From 4bb362a58ce6fb1bf32efd8a5202f28aa909f5f1 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)
2015-03-05 17:43:43 +08:00
Thomas Zimmermann
a1c98c3c72 Bug 1140383: Add fast path for NFC:QueryInfo, r=allstars.chh
Messages of type NFC:QueryInfo return local RF state. We don't need
the NFC Service, so we can return early.
2015-03-10 13:51:57 +01:00
Yoshi Huang
d9b5b09720 Bug 1139830 - Make type/id/payload nullable in MozNDEFRecordOptions. r=smaug 2015-03-06 16:23:21 +08:00
Yoshi Huang
3c9cfd2a18 Bug 1137107 - Part 2: Add NfcResponseType and NfcNotificationType. r=smaug, dimi 2015-02-26 17:23:17 +08:00
Yoshi Huang
4cf97dac15 Bug 1137107 - Part 1: Add NfcRequestType. r=smaug, dimi
From 2c1e87a8e1018f2c1d9f8825e36d1478a8a409bc Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js                | 22 ++++++---
 dom/nfc/gonk/NfcGonkMessage.h      |  9 ----
 dom/nfc/gonk/NfcMessageHandler.cpp | 91 +++++++++++++++++++-------------------
 dom/nfc/gonk/NfcOptions.h          |  2 +-
 dom/webidl/NfcOptions.webidl       | 16 ++++++-
 5 files changed, 76 insertions(+), 64 deletions(-)
2015-02-26 13:49:28 +08:00
Yoshi Huang
dcb1428e8d Bug 1137101 - Refactor Response/Notification sent from nfcd. r=dimi
From 80bbb263c548a86287bec29c5983e0ca3714a841 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/NfcGonkMessage.h      | 12 +++++----
 dom/nfc/gonk/NfcMessageHandler.cpp | 52 +++++++++++++++++++++++++-------------
 dom/nfc/gonk/NfcMessageHandler.h   |  5 ++--
 3 files changed, 44 insertions(+), 25 deletions(-)
2015-02-16 18:47:58 +08:00
Yoshi Huang
8045419885 Bug 1133390 - onfocuschanged(false) will be notified twice. r=dimi
From 1c1b9ad0570901cc2c9ce6bce1bbeda210c1e1ca Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
2015-02-16 11:13:18 +08:00
Yoshi Huang
8bc84aba88 Bug 1131454 - Don't add transceive req into RequestQueue in NfcMessageHandler. r=dlee 2015-02-10 14:19:38 +08:00
Yoshi Huang
1c3ee03b32 Bug 1127726 - Cannot receive NDEF from another NFC Peer. r=vchang 2015-01-30 16:10:12 +08:00
Yoshi Huang
1079afc0c7 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
a0418fb15a 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
c18d34ee83 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
68eca9fbed 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
5824d37d8b Bug 1082440 - B2G NFC: Dispatch NFC events to foreground app. r=yoshi 2015-01-23 11:35:03 +08:00
Dimi Lee
1b2902b630 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
7b75a9ed87 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
73129bab53 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
602507c295 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
3d1e097a95 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
b0548b1e2d 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
0f8a37e350 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
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
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
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
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
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
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
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
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
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