From: Szymon Jastrzebski <s.jastrzebsk@partner.samsung.com>
Date: Thu, 27 Jul 2017 11:34:49 +0000 (+0200)
Subject: [NFC] Fixing preferred application description
X-Git-Tag: GitHub/PR#40/tizen-studio~92^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=941a4f569844ebff9eb89c4fb0580d019f03a6c7;p=sdk%2Fonline-doc.git

[NFC] Fixing preferred application description

Change-Id: I219220132a09f1f43606b14464a1a780b7eab61e
Signed-off-by: Szymon Jastrzebski <s.jastrzebsk@partner.samsung.com>
---

diff --git a/org.tizen.web.apireference/html/device_api/mobile/tizen/nfc.html b/org.tizen.web.apireference/html/device_api/mobile/tizen/nfc.html
index efa6299..6fb7134 100755
--- a/org.tizen.web.apireference/html/device_api/mobile/tizen/nfc.html
+++ b/org.tizen.web.apireference/html/device_api/mobile/tizen/nfc.html
@@ -2424,7 +2424,7 @@ Calling the method allows to change routing priority of NFC card emulation witho
 As long as the application is in foreground, it will be set as the receiver of card emulation events instead of the application chosen in NFC Settings.
             </p>
             <p>
-When the application leaves the foreground, receiving NFC card events is stopped for this application. The default application from settings would be used instead.
+When the application leaves the foreground, receiving NFC card events is stopped for this application. The default application from settings will be used instead.
             </p>
             <p>
 When the application comes back from background, receiving events is turned back on.
@@ -2439,10 +2439,7 @@ When the application comes back from background, receiving events is turned back
  http://tizen.org/privilege/nfc.cardemulation
             </p>
 <p><span class="remark"> Remark : </span>
- This method may not be supported on every mobile device.
-            </p>
-<p><span class="remark"> Remark : </span>
- To check if NFC card emulation is supported on this device, use <var>tizen.systeminfo.getCapability("http://tizen.org/feature/network.nfc.card_emulation.hce")</var>.
+ To check if NFC card emulation is supported on this device, use <var>tizen.systeminfo.getCapability("http://tizen.org/feature/network.nfc.card_emulation")</var>.
             </p>
 <div class="exceptionlist">
 <p><span class="except">Exceptions:</span></p>
@@ -2451,9 +2448,6 @@ When the application comes back from background, receiving events is turned back
  with error type AbortError, if any system error occured.
                 </p></li>
 <li class="list"><p>
- with error type InvalidStateError, if the application was already set as preferred.
-                </p></li>
-<li class="list"><p>
  with error type NotSupportedError, if this feature is not supported.
                 </p></li>
 <li class="list"><p>
@@ -2508,9 +2502,6 @@ To set application as preferred again, use <a href="#NFCAdapter::setPreferredApp
  http://tizen.org/privilege/nfc.cardemulation
             </p>
 <p><span class="remark"> Remark : </span>
- This method may not be supported on every mobile device.
-            </p>
-<p><span class="remark"> Remark : </span>
  To check if NFC card emulation is supported on this device, use <var>tizen.systeminfo.getCapability("http://tizen.org/feature/network.nfc.card_emulation")</var>.
             </p>
 <div class="exceptionlist">
diff --git a/org.tizen.web.apireference/html/device_api/wearable/tizen/nfc.html b/org.tizen.web.apireference/html/device_api/wearable/tizen/nfc.html
index 514ef82..e72ed10 100755
--- a/org.tizen.web.apireference/html/device_api/wearable/tizen/nfc.html
+++ b/org.tizen.web.apireference/html/device_api/wearable/tizen/nfc.html
@@ -2425,7 +2425,7 @@ Calling the method allows to change routing priority of NFC card emulation witho
 As long as the application is in foreground, it will be set as the receiver of card emulation events instead of the application chosen in NFC Settings.
             </p>
             <p>
-When the application leaves the foreground, receiving NFC card events is stopped for this application. The default application from settings would be used instead.
+When the application leaves the foreground, receiving NFC card events is stopped for this application. The default application from settings will be used instead.
             </p>
             <p>
 When the application comes back from background, receiving events is turned back on.
@@ -2440,10 +2440,7 @@ When the application comes back from background, receiving events is turned back
  http://tizen.org/privilege/nfc.cardemulation
             </p>
 <p><span class="remark"> Remark : </span>
- This method may not be supported on every mobile device.
-            </p>
-<p><span class="remark"> Remark : </span>
- To check if NFC card emulation is supported on this device, use <var>tizen.systeminfo.getCapability("http://tizen.org/feature/network.nfc.card_emulation.hce")</var>.
+ To check if NFC card emulation is supported on this device, use <var>tizen.systeminfo.getCapability("http://tizen.org/feature/network.nfc.card_emulation")</var>.
             </p>
 <div class="exceptionlist">
 <p><span class="except">Exceptions:</span></p>
@@ -2452,9 +2449,6 @@ When the application comes back from background, receiving events is turned back
  with error type AbortError, if any system error occured.
                 </p></li>
 <li class="list"><p>
- with error type InvalidStateError, if the application was already set as preferred.
-                </p></li>
-<li class="list"><p>
  with error type NotSupportedError, if this feature is not supported.
                 </p></li>
 <li class="list"><p>
@@ -2509,9 +2503,6 @@ To set application as preferred again, use <a href="#NFCAdapter::setPreferredApp
  http://tizen.org/privilege/nfc.cardemulation
             </p>
 <p><span class="remark"> Remark : </span>
- This method may not be supported on every mobile device.
-            </p>
-<p><span class="remark"> Remark : </span>
  To check if NFC card emulation is supported on this device, use <var>tizen.systeminfo.getCapability("http://tizen.org/feature/network.nfc.card_emulation")</var>.
             </p>
 <div class="exceptionlist">