diff options
| author | Scott Main <smain@google.com> | 2013-11-12 11:35:54 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-12 11:35:54 -0800 |
| commit | 6f569bd971ef0248750888e6c4b118b0974111af (patch) | |
| tree | 92d5e1af6888a06fe6b883eeefc7dcabfc0939e6 | |
| parent | 191b2bd8d0f6e33b2123c64bc8af1c6ec175b5f0 (diff) | |
| parent | fe326adc6a8641557b86905087ea2272f0c29491 (diff) | |
| download | frameworks_base-6f569bd971ef0248750888e6c4b118b0974111af.zip frameworks_base-6f569bd971ef0248750888e6c4b118b0974111af.tar.gz frameworks_base-6f569bd971ef0248750888e6c4b118b0974111af.tar.bz2 | |
am fe326adc: am 45d93219: fix typo in caption and XML spacing
* commit 'fe326adc6a8641557b86905087ea2272f0c29491':
fix typo in caption and XML spacing
| -rw-r--r-- | docs/html/guide/topics/connectivity/nfc/hce.jd | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/docs/html/guide/topics/connectivity/nfc/hce.jd b/docs/html/guide/topics/connectivity/nfc/hce.jd index 3e6468f..4ef6859 100644 --- a/docs/html/guide/topics/connectivity/nfc/hce.jd +++ b/docs/html/guide/topics/connectivity/nfc/hce.jd @@ -70,7 +70,7 @@ protocol frames to a secure element. Figure 2 illustrates how host-based card em works.</p> <img src="{@docRoot}images/nfc/host-based-card.png" /> -<p class="img-caption"><strong>Figure 2.</strong> NFC card emulation with a secure element.</p> +<p class="img-caption"><strong>Figure 2.</strong> NFC card emulation without a secure element.</p> <h2 id="SupportedProtocols">Supported NFC Cards and Protocols</h2> @@ -288,12 +288,12 @@ enforces that only the Android OS can bind to your service. </p> <pre> <service android:name=".MyHostApduService" android:exported="true" - android:permission="android.permission.BIND_NFC_SERVICE"> + android:permission="android.permission.BIND_NFC_SERVICE"> <intent-filter> <action android:name="android.nfc.cardemulation.action.HOST_APDU_SERVICE"/> </intent-filter> <meta-data android:name="android.nfc.cardemulation.host_apdu_service" - android:resource="@xml/apduservice"/> + android:resource="@xml/apduservice"/> </service> </pre> @@ -306,7 +306,7 @@ below:</p> android:description="@string/servicedesc" android:requireDeviceUnlock="false"> <aid-group android:description="@string/aiddescription" - android:category="other"> + android:category="other"> <aid-filter android:name="F0010203040506"/> <aid-filter android:name="F0394148148100"/> </aid-group> @@ -381,14 +381,14 @@ shown below:</p> <pre> <host-apdu-service xmlns:android="http://schemas.android.com/apk/res/android" - android:description="@string/servicedesc" - android:requireDeviceUnlock="false" - android:apduServiceBanner="@drawable/my_banner"> - <aid-group android:description="@string/aiddescription" - android:category="payment"> - <aid-filter android:name="F0010203040506"/> - <aid-filter android:name="F0394148148100"/> - </aid-group> + android:description="@string/servicedesc" + android:requireDeviceUnlock="false" + android:apduServiceBanner="@drawable/my_banner"> + <aid-group android:description="@string/aiddescription" + android:category="payment"> + <aid-filter android:name="F0010203040506"/> + <aid-filter android:name="F0394148148100"/> + </aid-group> </host-apdu-service> </pre> @@ -478,12 +478,12 @@ almost identical to the declaration of a HCE service. The exceptions are:</p> <pre> <service android:name=".MyOffHostApduService" android:exported="true" - android:permission="android.permission.BIND_NFC_SERVICE"> + android:permission="android.permission.BIND_NFC_SERVICE"> <intent-filter> <action android:name="android.nfc.cardemulation.action.OFF_HOST_APDU_SERVICE"/> </intent-filter> <meta-data android:name="android.nfc.cardemulation.off_host_apdu_ervice" - android:resource="@xml/apduservice"/> + android:resource="@xml/apduservice"/> </service> </pre> </li> |