summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nci/jni/NativeLlcpServiceSocket.cpp3
-rw-r--r--nci/jni/NativeNfcManager.cpp3
-rw-r--r--nci/jni/NativeNfcTag.cpp5
-rwxr-xr-x[-rw-r--r--]nci/jni/RoutingManager.cpp2
-rw-r--r--nci/jni/extns/pn54x/src/mifare/phFriNfc_MifareStdMap.cpp3
-rwxr-xr-xnci/src/com/android/nfc/dhimpl/NativeNfcTag.java70
-rw-r--r--res/values-as/strings.xml2
-rw-r--r--res/values-de/strings.xml2
-rw-r--r--res/values-eu/strings.xml2
-rw-r--r--res/values-fa/strings.xml14
-rw-r--r--res/values-fr-rCA/strings.xml18
-rw-r--r--res/values-gu/strings.xml2
-rw-r--r--res/values-hy/strings.xml2
-rw-r--r--res/values-in/strings.xml2
-rw-r--r--res/values-iw/strings.xml2
-rw-r--r--res/values-ne/strings.xml4
-rw-r--r--res/values-or/strings.xml2
-rw-r--r--res/values-ta/strings.xml4
-rw-r--r--res/values-te/strings.xml2
-rw-r--r--src/com/android/nfc/DeviceHost.java9
-rw-r--r--src/com/android/nfc/NfcService.java11
-rw-r--r--src/com/android/nfc/beam/SendUi.java7
22 files changed, 126 insertions, 45 deletions
diff --git a/nci/jni/NativeLlcpServiceSocket.cpp b/nci/jni/NativeLlcpServiceSocket.cpp
index 76ffeea5..1000deef 100644
--- a/nci/jni/NativeLlcpServiceSocket.cpp
+++ b/nci/jni/NativeLlcpServiceSocket.cpp
@@ -119,7 +119,8 @@ static jboolean nativeLlcpServiceSocket_doClose(JNIEnv* e, jobject o) {
stat = PeerToPeer::getInstance().deregisterServer(jniServerHandle);
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: exit", __func__);
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: exit Status=0x%X", __func__, stat);
return JNI_TRUE;
}
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index a7f9869b..55a27b1f 100644
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -1437,7 +1437,8 @@ void nfcManager_disableDiscovery(JNIEnv* e, jobject o) {
if (!PowerSwitch::getInstance().setModeOff(PowerSwitch::DISCOVERY))
PowerSwitch::getInstance().setLevel(PowerSwitch::LOW_POWER);
TheEnd:
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: exit", __func__);
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: exit: Status = 0x%X", __func__, status);
}
/*******************************************************************************
diff --git a/nci/jni/NativeNfcTag.cpp b/nci/jni/NativeNfcTag.cpp
index 5d20d36e..a99dc941 100644
--- a/nci/jni/NativeNfcTag.cpp
+++ b/nci/jni/NativeNfcTag.cpp
@@ -315,7 +315,8 @@ static jbyteArray nativeNfcTag_doRead(JNIEnv* e, jobject) {
}
sReadDataLen = 0;
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: exit", __func__);
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: exit: Status = 0x%X", __func__, status);
return buf;
}
@@ -1636,6 +1637,8 @@ static jboolean nativeNfcTag_doNdefFormat(JNIEnv* e, jobject o, jbyteArray) {
if (sCurrentConnectedTargetProtocol == NFA_PROTOCOL_ISO_DEP) {
int retCode = NFCSTATUS_SUCCESS;
retCode = nativeNfcTag_doReconnect(e, o);
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s Status = 0x%X", __func__, retCode);
}
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: exit", __func__);
return (status == NFA_STATUS_OK) ? JNI_TRUE : JNI_FALSE;
diff --git a/nci/jni/RoutingManager.cpp b/nci/jni/RoutingManager.cpp
index 0e0630f4..0887e7c0 100644..100755
--- a/nci/jni/RoutingManager.cpp
+++ b/nci/jni/RoutingManager.cpp
@@ -654,6 +654,8 @@ void RoutingManager::updateDefaultRoute() {
<< fn << ": Succeed to register system code";
} else {
LOG(ERROR) << fn << ": Fail to register system code";
+ // still support SCBR routing for other NFCEEs
+ mIsScbrSupported = true;
}
// Register zero lengthy Aid for default Aid Routing
diff --git a/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifareStdMap.cpp b/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifareStdMap.cpp
index 5fcf693b..05d3258b 100644
--- a/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifareStdMap.cpp
+++ b/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifareStdMap.cpp
@@ -320,7 +320,7 @@ NFCSTATUS phFriNfc_MifareStdMap_H_Reset(phFriNfc_NdefMap_t* NdefMap) {
******************************************************************************/
NFCSTATUS phFriNfc_MifareStdMap_ChkNdef(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS status = NFCSTATUS_PENDING;
- uint8_t atq, sak;
+ uint8_t sak;
if (NdefMap == NULL) {
status = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_PARAMETER);
@@ -331,7 +331,6 @@ NFCSTATUS phFriNfc_MifareStdMap_ChkNdef(phFriNfc_NdefMap_t* NdefMap) {
/* Get the Select Response and Sense Response to get
the exact Card Type either Mifare 1k or 4k */
sak = NdefMap->psRemoteDevInfo->RemoteDevInfo.Iso14443A_Info.Sak;
- atq = NdefMap->psRemoteDevInfo->RemoteDevInfo.Iso14443A_Info.AtqA[0];
if (0x08 == (sak & 0x18)) {
/* Total Number of Blocks in Mifare 1k Card */
diff --git a/nci/src/com/android/nfc/dhimpl/NativeNfcTag.java b/nci/src/com/android/nfc/dhimpl/NativeNfcTag.java
index 671ea2b2..117bf3ae 100755
--- a/nci/src/com/android/nfc/dhimpl/NativeNfcTag.java
+++ b/nci/src/com/android/nfc/dhimpl/NativeNfcTag.java
@@ -17,9 +17,6 @@
package com.android.nfc.dhimpl;
import android.annotation.Nullable;
-import com.android.nfc.DeviceHost;
-import com.android.nfc.DeviceHost.TagEndpoint;
-
import android.nfc.FormatException;
import android.nfc.NdefMessage;
import android.nfc.tech.IsoDep;
@@ -28,13 +25,16 @@ import android.nfc.tech.MifareUltralight;
import android.nfc.tech.Ndef;
import android.nfc.tech.NfcA;
import android.nfc.tech.NfcB;
+import android.nfc.tech.NfcBarcode;
import android.nfc.tech.NfcF;
import android.nfc.tech.NfcV;
-import android.nfc.tech.NfcBarcode;
import android.nfc.tech.TagTechnology;
import android.os.Bundle;
import android.util.Log;
+import com.android.nfc.DeviceHost;
+import com.android.nfc.DeviceHost.TagEndpoint;
+
/**
* Native interface to the NFC tag functions
*/
@@ -50,6 +50,8 @@ public class NativeNfcTag implements TagEndpoint {
private byte[][] mTechPollBytes;
private byte[][] mTechActBytes;
private byte[] mUid;
+ // Based on flag send T2T tag classification request
+ private boolean mClassifyT2T = true;
// mConnectedHandle stores the *real* libnfc handle
// that we're connected to.
@@ -284,6 +286,7 @@ public class NativeNfcTag implements TagEndpoint {
mConnectedTechIndex = -1;
mConnectedHandle = -1;
+ mClassifyT2T = true;
return result;
}
@@ -339,9 +342,16 @@ public class NativeNfcTag implements TagEndpoint {
}
return status;
}
+
@Override
public synchronized boolean checkNdef(int[] ndefinfo) {
- return checkNdefWithStatus(ndefinfo) == 0;
+ boolean status = false;
+ if (hasTech(TagTechnology.NDEF)) {
+ status = true;
+ } else {
+ status = checkNdefWithStatus(ndefinfo) == 0;
+ }
+ return status;
}
private native byte[] doRead();
@@ -726,8 +736,10 @@ public class NativeNfcTag implements TagEndpoint {
}
case TagTechnology.MIFARE_ULTRALIGHT: {
- boolean isUlc = isUltralightC();
- extras.putBoolean(MifareUltralight.EXTRA_IS_UL_C, isUlc);
+ if (mClassifyT2T) {
+ boolean isUlc = isUltralightC();
+ extras.putBoolean(MifareUltralight.EXTRA_IS_UL_C, isUlc);
+ }
break;
}
@@ -845,4 +857,48 @@ public class NativeNfcTag implements TagEndpoint {
return ndefMsg;
}
+
+ @Override
+ public void findNdef() {
+ int[] technologies = getTechList();
+ int[] handles = mTechHandles;
+ int currHandle = 0;
+ mClassifyT2T = !hasTech(TagTechnology.MIFARE_ULTRALIGHT);
+
+ for (int techIndex = 0; techIndex < technologies.length; techIndex++) {
+ if (currHandle != handles[techIndex]) {
+ currHandle = handles[techIndex];
+ int status = connectWithStatus(technologies[techIndex]);
+ if (status != 0) {
+ Log.d(TAG, "Connect Failed - status = " + status);
+ if (status == STATUS_CODE_TARGET_LOST) {
+ break;
+ }
+ continue; // try next handle
+ }
+
+ int[] ndefinfo = new int[2];
+ status = checkNdefWithStatus(ndefinfo);
+ if (status != 0) {
+ Log.d(TAG, "findNdef: Check NDEF Failed - status = "
+ + status);
+ if (status == STATUS_CODE_TARGET_LOST) {
+ break;
+ }
+ continue; // try next handle
+ } else {
+ int supportedNdefLength = ndefinfo[0];
+ int cardState = ndefinfo[1];
+ addNdefTechnology(null,
+ getConnectedHandle(),
+ getConnectedLibNfcType(),
+ getConnectedTechnology(),
+ supportedNdefLength, cardState);
+ break;
+ }
+ } else {
+ Log.d(TAG, "findNdef: Duplicate techIndex = " + techIndex);
+ }
+ }
+ }
}
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 884a68c1..bfa8b03f 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -42,7 +42,7 @@
<string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> নেটৱৰ্কৰ লগত সংযোগ কৰিবনে?"</string>
<string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android বীমে NFC সক্ষম কৰিব লাগিব৷ আপুনি ইয়াক সক্ষম কৰিবলৈ বিচাৰেনে?"</string>
<string name="android_beam" msgid="1666446406999492763">"Android বীম"</string>
- <string name="beam_requires_external_storage_permission" msgid="8798337545702206901">"এপ্লিকেশ্বনটোৰ বাহ্যিক ষ্ট’ৰেজ ব্যৱহাৰ কৰাৰ অনুমতি নাই৷ এই ফাইলটো বীম কৰিবলৈ এয়া প্ৰয়োজন।"</string>
+ <string name="beam_requires_external_storage_permission" msgid="8798337545702206901">"এপ্লিকেশ্বনটোৰ বাহ্যিক সঞ্চয়াগাৰ ব্যৱহাৰ কৰাৰ অনুমতি নাই৷ এই ফাইলটো বীম কৰিবলৈ এয়া প্ৰয়োজন।"</string>
<string name="title_confirm_url_open" msgid="8069968913244794478">"লিংক খুলিবনে?"</string>
<string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"আপোনাৰ টেবলেটে NFC যোগে এই লিংক পাইছে:"</string>
<string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"আপোনাৰ ফ\'নে NFC যোগে এই লিংক পাইছে:"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 66bf6c6c..767e5f9f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -25,7 +25,7 @@
<string name="pairing_peripheral_failed" msgid="6087643307743264679">"Koppeln mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nicht möglich"</string>
<string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth konnte nicht aktiviert werden."</string>
<string name="confirm_pairing" msgid="4112568077038265363">"Möchtest du das Bluetooth-Gerät <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wirklich koppeln?"</string>
- <string name="pair_yes" msgid="3525614878559994448">"Ja"</string>
+ <string name="pair_yes" msgid="3525614878559994448">"„Ja“"</string>
<string name="pair_no" msgid="5022308368904055020">"Nein"</string>
<string name="tap_again_to_pay" msgid="5754988005412859897">"Halte dein Gerät erneut ans Terminal, um mit <xliff:g id="APP">%1$s</xliff:g> zu bezahlen."</string>
<string name="tap_again_to_complete" msgid="5423640945118279123">"Halte dein Gerät erneut ans Terminal, um den Vorgang mit <xliff:g id="APP">%1$s</xliff:g> durchzuführen."</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 507ac44f..1d54adda 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -14,7 +14,7 @@
<string name="beam_tap_to_view" msgid="7430394753262448349">"Sakatu ikusteko"</string>
<string name="beam_handover_not_supported" msgid="4083165921751489015">"Hartzailearen gailuak ez du onartzen fitxategi handiak NFC bidez transferitzea."</string>
<string name="beam_try_again" msgid="3364677301009783455">"Elkartu gailuak berriro"</string>
- <string name="beam_busy" msgid="5253335587620612576">"Beam okupatuta dago. Saiatu berriro abian den transferentzia amaitutakoan."</string>
+ <string name="beam_busy" msgid="5253335587620612576">"Beam lanpetuta dago. Saiatu berriro abian den transferentzia amaitutakoan."</string>
<string name="device" msgid="4459621591392478151">"gailua"</string>
<string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> konektatzen"</string>
<string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> konektatu da"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index b07dacdc..0ff52748 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="78565911793142902">"‏سرویس NFC"</string>
- <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
- <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"‏مجهز به NFC."</string>
+ <string name="app_name" msgid="78565911793142902">"‏سرویس «ارتباط میدان نزدیک» (NFC)"</string>
+ <string name="nfcUserLabel" msgid="7708535817084357357">"‏ارتباط میدان نزدیک (NFC)"</string>
+ <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"‏مجهز به «ارتباط میدان نزدیک» (NFC)."</string>
<string name="tap_to_beam" msgid="5819197866281059878">"برای ارسال پرتو ضربه بزنید"</string>
<string name="beam_progress" msgid="7453634884807323920">"در حال دریافت پرتو..."</string>
<string name="beam_outgoing" msgid="4679536649779123495">"پرتو…"</string>
@@ -40,15 +40,15 @@
<string name="status_wifi_connected" msgid="5893022897732105739">"مرتبط شد"</string>
<string name="title_connect_to_network" msgid="2474034615817280146">"اتصال به شبکه"</string>
<string name="prompt_connect_to_network" msgid="8511683573657516114">"به شبکه <xliff:g id="NETWORK_SSID">%1$s</xliff:g> متصل می‌شوید؟"</string>
- <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"‏Android Beam برای فعال شدن به NFC نیاز دارد. می‌خواهید آن را فعال کنید؟"</string>
+ <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"‏Android Beam برای فعال شدن به «ارتباط میدان نزدیک» (NFC) نیاز دارد. می‌خواهید آن را فعال کنید؟"</string>
<string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
<string name="beam_requires_external_storage_permission" msgid="8798337545702206901">"برنامه،ِ مجوز فضای ذخیره‌سازی خارجی را ندارد. این مجوز برای «پرتوی» فایل لازم است"</string>
<string name="title_confirm_url_open" msgid="8069968913244794478">"پیوند باز شود؟"</string>
- <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"‏رایانه لوحی‌تان پیوندی ازطریق NFC دریافت کرد:"</string>
- <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"‏تلفنتان پیوندی ازطریق NFC دریافت کرد:"</string>
+ <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"‏رایانه لوحی‌تان پیوندی ازطریق «ارتباط میدان نزدیک» (NFC) دریافت کرد:"</string>
+ <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"‏تلفنتان پیوندی ازطریق «ارتباط میدان نزدیک» (NFC) دریافت کرد:"</string>
<string name="action_confirm_url_open" msgid="3458322738812921189">"باز کردن پیوند"</string>
<string name="tag_read_error" msgid="2485274498885877547">"‏خطای خواندن «ارتباطات میدان‌نزدیک» (NFC). دوباره امتحان کنید."</string>
- <string name="tag_dispatch_failed" msgid="3562984995049738400">"‏برنامه پشتیبانی‌شده‌ای برای نشان NFC وجود ندارد"</string>
+ <string name="tag_dispatch_failed" msgid="3562984995049738400">"‏برنامه پشتیبانی‌شده‌ای برای نشان «ارتباط میدان نزدیک» (NFC) وجود ندارد"</string>
<string name="nfc_blocking_alert_title" msgid="1086172436984457085">"‏ممکن است «ارتباطات میدان‌نزدیک» (NFC) مسدود باشد"</string>
<string name="nfc_blocking_alert_message" msgid="7003156052570107490">"برای آشنایی با نحوه برطرف کردن مشکل، ضربه بزنید."</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 4f26cc67..05b2bbb4 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="78565911793142902">"Service CCP"</string>
- <string name="nfcUserLabel" msgid="7708535817084357357">"CCP"</string>
- <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"CCP activée"</string>
+ <string name="app_name" msgid="78565911793142902">"Service NFC"</string>
+ <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
+ <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC activée"</string>
<string name="tap_to_beam" msgid="5819197866281059878">"Touchez pour partager"</string>
<string name="beam_progress" msgid="7453634884807323920">"Partage entrant..."</string>
<string name="beam_outgoing" msgid="4679536649779123495">"Partage en cours…"</string>
@@ -40,15 +40,15 @@
<string name="status_wifi_connected" msgid="5893022897732105739">"Connecté"</string>
<string name="title_connect_to_network" msgid="2474034615817280146">"Se connecter au réseau"</string>
<string name="prompt_connect_to_network" msgid="8511683573657516114">"Se connecter au réseau <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
- <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"L\'activation de la technologie CCP est nécessaire pour utiliser Android Beam. Voulez-vous l\'activer?"</string>
+ <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"L\'activation de la connectivité NFC est nécessaire pour utiliser Android Beam. Voulez-vous l\'activer?"</string>
<string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
<string name="beam_requires_external_storage_permission" msgid="8798337545702206901">"L\'application ne possède pas l\'autorisation d\'accès aux dispositifs de stockage externes. Cela est nécessaire pour partager ce fichier."</string>
<string name="title_confirm_url_open" msgid="8069968913244794478">"Ouvrir le lien?"</string>
- <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Votre tablette a reçu un lien par CCP :"</string>
- <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Votre téléphone a reçu un lien par CCP :"</string>
+ <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Votre tablette a reçu un lien par NFC :"</string>
+ <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Votre téléphone a reçu un lien par NFC :"</string>
<string name="action_confirm_url_open" msgid="3458322738812921189">"Ouvrir le lien"</string>
- <string name="tag_read_error" msgid="2485274498885877547">"Erreur de lecture CCP. Réessayez."</string>
- <string name="tag_dispatch_failed" msgid="3562984995049738400">"Aucune application prise en charge pour cette balise CCP"</string>
- <string name="nfc_blocking_alert_title" msgid="1086172436984457085">"La CCP est peut-être bloquée"</string>
+ <string name="tag_read_error" msgid="2485274498885877547">"Erreur de lecture NFC. Réessayez."</string>
+ <string name="tag_dispatch_failed" msgid="3562984995049738400">"Aucune application prise en charge pour cette balise NFC"</string>
+ <string name="nfc_blocking_alert_title" msgid="1086172436984457085">"La NFC est peut-être bloquée"</string>
<string name="nfc_blocking_alert_message" msgid="7003156052570107490">"Touchez pour apprendre comment la débloquer."</string>
</resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 0428c7c9..9db1408d 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -12,7 +12,7 @@
<string name="beam_canceled" msgid="5425192751826544741">"બીમ રદ કર્યું"</string>
<string name="cancel" msgid="61873902552555096">"રદ કરો"</string>
<string name="beam_tap_to_view" msgid="7430394753262448349">"જોવા માટે ટૅપ કરો"</string>
- <string name="beam_handover_not_supported" msgid="4083165921751489015">"પ્રાપ્તિકર્તાનું ડિવાઇસ બીમ દ્વારા મોટી ફાઇલનાં ટ્રાન્સફરને સપોર્ટ કરતું નથી."</string>
+ <string name="beam_handover_not_supported" msgid="4083165921751489015">"પ્રાપ્તિકર્તાનું ઉપકરણ બીમ દ્વારા મોટી ફાઇલનાં સ્થાનાંતરણનું સમર્થન કરતું નથી."</string>
<string name="beam_try_again" msgid="3364677301009783455">"ઉપકરણોને ફરીથી એકસાથે લાવો"</string>
<string name="beam_busy" msgid="5253335587620612576">"બીમ હાલમાં વ્યસ્ત છે. પહેલાંના સ્થાનાંતરણ પૂર્ણ થાય ત્યારે ફરીથી પ્રયાસ કરો."</string>
<string name="device" msgid="4459621591392478151">"ઉપકરણ"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 7151f0ea..0c4b54e5 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -21,7 +21,7 @@
<string name="connect_peripheral_failed" msgid="7925702596242839275">"Չհաջողվեց կապակցել <xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքը"</string>
<string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի կապախզում"</string>
<string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքը կապախզված է"</string>
- <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի զուգակցում"</string>
+ <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի զուգավորում"</string>
<string name="pairing_peripheral_failed" msgid="6087643307743264679">"Չհաջողվեց զուգակցել <xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքը"</string>
<string name="failed_to_enable_bt" msgid="7229153323594758077">"Չհաջողվեց միացնել Bluetooth-ը"</string>
<string name="confirm_pairing" msgid="4112568077038265363">"Իսկապե՞ս ուզում եք զուգակցել <xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth սարքը:"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index bdfffb79..bb14cbd7 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -37,7 +37,7 @@
<string name="ask_nfc_tap" msgid="2925239870458286340">"Ketuk perangkat lain untuk menyelesaikan"</string>
<string name="wifi_connect" msgid="6250727951843550671">"Hubungkan"</string>
<string name="status_unable_to_connect" msgid="9183908200295307657">"Tidak dapat menyambung ke jaringan"</string>
- <string name="status_wifi_connected" msgid="5893022897732105739">"Terhubung"</string>
+ <string name="status_wifi_connected" msgid="5893022897732105739">"Tersambung"</string>
<string name="title_connect_to_network" msgid="2474034615817280146">"Sambungkan ke jaringan"</string>
<string name="prompt_connect_to_network" msgid="8511683573657516114">"Sambungkan ke jaringan <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
<string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam memerlukan NFC untuk diaktifkan. Ingin mengaktifkannya?"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 0fca22c0..e0c77612 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -33,7 +33,7 @@
<string name="could_not_use_app" msgid="8137587876138569083">"לא ניתן היה להשתמש ב-<xliff:g id="APP">%1$s</xliff:g>."</string>
<string name="pay_with" msgid="5531545488795798945">"תשלום באמצעות"</string>
<string name="complete_with" msgid="6797459104103012992">"השלמה באמצעות"</string>
- <string name="default_pay_app_removed" msgid="4108250545457437360">"השירות המועדף עליך עבור \'תשלום בקליק\' הוסר. האם לבחור אחר?"</string>
+ <string name="default_pay_app_removed" msgid="4108250545457437360">"השירות המועדף עליך עבור \'הקשה לתשלום\' הוסר. האם לבחור אחר?"</string>
<string name="ask_nfc_tap" msgid="2925239870458286340">"יש להקיש על מכשיר אחר להשלמה"</string>
<string name="wifi_connect" msgid="6250727951843550671">"התחברות"</string>
<string name="status_unable_to_connect" msgid="9183908200295307657">"לא ניתן להתחבר לרשת"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 90930650..af307d7b 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -35,10 +35,10 @@
<string name="complete_with" msgid="6797459104103012992">"सँग समाप्त गर्नुहोस्"</string>
<string name="default_pay_app_removed" msgid="4108250545457437360">"तपाईँको प्राथमिकमा पर्ने Tap &amp; Pay सेवा हटाइयो। अर्को चयन गर्नुहुन्छ?"</string>
<string name="ask_nfc_tap" msgid="2925239870458286340">"पूरा गर्नको लागि अर्को उपकरण ट्याप गर्नुहोस्"</string>
- <string name="wifi_connect" msgid="6250727951843550671">"कनेक्ट गर्नुहोस्"</string>
+ <string name="wifi_connect" msgid="6250727951843550671">"जडान गर्नुहोस्"</string>
<string name="status_unable_to_connect" msgid="9183908200295307657">"सञ्जालसँग जडान गर्न असक्षम भयो"</string>
<string name="status_wifi_connected" msgid="5893022897732105739">"जोडिएको"</string>
- <string name="title_connect_to_network" msgid="2474034615817280146">"सञ्जालमा कनेक्ट गर्नुहोस्"</string>
+ <string name="title_connect_to_network" msgid="2474034615817280146">"सञ्जालमा जडान गर्नुहोस्"</string>
<string name="prompt_connect_to_network" msgid="8511683573657516114">"सञ्जाल <xliff:g id="NETWORK_SSID">%1$s</xliff:g>मा जडान गर्ने?"</string>
<string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android बीम सक्षम गर्नको लागि NFC आवश्यक छ। के तपाईं यसलाई सक्षम गर्न चाहनुहुन्छ?"</string>
<string name="android_beam" msgid="1666446406999492763">"Android बिम"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index dc46fa47..5f81d8ab 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -10,7 +10,7 @@
<string name="beam_complete" msgid="477026736424637435">"ବିମ୍‌ ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି"</string>
<string name="beam_failed" msgid="5116241718189888630">"ବିମ୍‌ ସମ୍ପୂର୍ଣ୍ଣ ହେଲା ନାହିଁ"</string>
<string name="beam_canceled" msgid="5425192751826544741">"ବିମ୍‌ ବାତିଲ୍‌ ହୋଇଛି"</string>
- <string name="cancel" msgid="61873902552555096">"ବାତିଲ୍ କରନ୍ତୁ"</string>
+ <string name="cancel" msgid="61873902552555096">"ବାତିଲ୍‍"</string>
<string name="beam_tap_to_view" msgid="7430394753262448349">"ଦେଖିବା ପାଇଁ ଟାପ୍‌ କରନ୍ତୁ"</string>
<string name="beam_handover_not_supported" msgid="4083165921751489015">"ପ୍ରାପ୍ତକର୍ତ୍ତାଙ୍କ ଡିଭାଇସ୍‌, ବିମ୍‌ ମାଧ୍ୟମରେ ବଡ଼ ସାଇଜ୍‌ର ଫାଇଲ୍ ଟ୍ରାନ୍ସଫର‌୍‌ ସପୋର୍ଟ କରେନାହିଁ।"</string>
<string name="beam_try_again" msgid="3364677301009783455">"ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ ପୁଣି ଏକାଠି କରନ୍ତୁ"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 3081a349..d91c384b 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -12,7 +12,7 @@
<string name="beam_canceled" msgid="5425192751826544741">"பீம் ரத்து செய்யப்பட்டது"</string>
<string name="cancel" msgid="61873902552555096">"ரத்துசெய்"</string>
<string name="beam_tap_to_view" msgid="7430394753262448349">"பார்க்க, தட்டவும்"</string>
- <string name="beam_handover_not_supported" msgid="4083165921751489015">"பெறுநரின் சாதனம் பீம் வழியான பெரிய ஃபைல் பரிமாற்றத்தை ஆதரிக்கவில்லை."</string>
+ <string name="beam_handover_not_supported" msgid="4083165921751489015">"பெறுநரின் சாதனம் பீம் வழியான பெரிய கோப்புப் பரிமாற்றத்தை ஆதரிக்கவில்லை."</string>
<string name="beam_try_again" msgid="3364677301009783455">"மீண்டும் சாதனங்களை ஒன்றாகக் கொண்டுவரவும்"</string>
<string name="beam_busy" msgid="5253335587620612576">"பீம் தற்போது பணிமிகுதியில் உள்ளது. முந்தைய இடமாற்றம் முடியும்போது, மீண்டும் முயலவும்."</string>
<string name="device" msgid="4459621591392478151">"சாதனம்"</string>
@@ -42,7 +42,7 @@
<string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> நெட்வொர்க்குடன் இணைக்கவா?"</string>
<string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android பீம்மிற்கு NFC இயக்கப்பட்டிருக்க வேண்டும். இயக்கவா?"</string>
<string name="android_beam" msgid="1666446406999492763">"Android பீம்"</string>
- <string name="beam_requires_external_storage_permission" msgid="8798337545702206901">"வெளிப்புறச் சேமிப்பகத்திற்கான அனுமதி பயன்பாட்டிற்கு இல்லை. ஃபைலை பீம் செய்ய, இந்த அனுமதி தேவை"</string>
+ <string name="beam_requires_external_storage_permission" msgid="8798337545702206901">"வெளிப்புறச் சேமிப்பகத்திற்கான அனுமதி பயன்பாட்டிற்கு இல்லை. கோப்பை பீம் செய்ய, இந்த அனுமதி தேவை"</string>
<string name="title_confirm_url_open" msgid="8069968913244794478">"இணைப்பைத் திறக்கவா?"</string>
<string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"NFC வழியாக உங்கள் டேப்லெட்டுக்கு, ஒரு இணைப்பு வந்துள்ளது:"</string>
<string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"NFC வழியாக உங்கள் ஃபோனுக்கு, ஒரு இணைப்பு வந்துள்ளது:"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 6edbd427..c7fb1731 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -31,7 +31,7 @@
<string name="tap_again_to_complete" msgid="5423640945118279123">"<xliff:g id="APP">%1$s</xliff:g>తో పూర్తి చేయడానికి మళ్లీ నొక్కండి"</string>
<string name="transaction_failure" msgid="7828102078637936513">"<xliff:g id="APP">%1$s</xliff:g>తో ఈ లావాదేవీని పూర్తి చేయడం సాధ్యపడలేదు."</string>
<string name="could_not_use_app" msgid="8137587876138569083">"<xliff:g id="APP">%1$s</xliff:g>ని ఉపయోగించడం సాధ్యపడలేదు."</string>
- <string name="pay_with" msgid="5531545488795798945">"దీనితో పేమెంట్ చేయండి"</string>
+ <string name="pay_with" msgid="5531545488795798945">"దీనితో చెల్లించండి"</string>
<string name="complete_with" msgid="6797459104103012992">"దీనితో పూర్తి చేయండి"</string>
<string name="default_pay_app_removed" msgid="4108250545457437360">"నొక్కి చెల్లించడం కోసం మీ ప్రాధాన్య సేవ తీసివేయబడింది. మరోదాన్ని ఎంచుకోవాలా?"</string>
<string name="ask_nfc_tap" msgid="2925239870458286340">"పూర్తి చేయడానికి మరో పరికరాన్ని నొక్కండి"</string>
diff --git a/src/com/android/nfc/DeviceHost.java b/src/com/android/nfc/DeviceHost.java
index a42c1484..2ce617e6 100644
--- a/src/com/android/nfc/DeviceHost.java
+++ b/src/com/android/nfc/DeviceHost.java
@@ -84,6 +84,15 @@ public interface DeviceHost {
boolean makeReadOnly();
int getConnectedTechnology();
+
+ /**
+ * Find Ndef only
+ * As per NFC forum test specification ndef write test expects only
+ * ndef detection followed by ndef write. System property
+ * nfc.dta.skipNdefRead added to skip default ndef read before tag
+ * dispatch. This system property is valid only in reader mode.
+ */
+ void findNdef();
}
public interface TagDisconnectedCallback {
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 4dbb7e36..c983fe48 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -271,6 +271,7 @@ public class NfcService implements DeviceHostListener {
boolean mInProvisionMode; // whether we're in setup wizard and enabled NFC provisioning
boolean mIsNdefPushEnabled;
boolean mIsSecureNfcEnabled;
+ boolean mSkipNdefRead;
NfcDiscoveryParameters mCurrentDiscoveryParameters =
NfcDiscoveryParameters.getNfcOffParameters();
@@ -846,6 +847,8 @@ public class NfcService implements DeviceHostListener {
mCardEmulationManager.onNfcEnabled();
}
+ mSkipNdefRead = SystemProperties.getBoolean("nfc.dta.skipNdefRead", false);
+
nci_version = getNciVersion();
Log.d(TAG, "NCI_Version: " + nci_version);
@@ -2629,6 +2632,14 @@ public class NfcService implements DeviceHostListener {
dispatchTagEndpoint(tag, readerParams);
break;
}
+
+ if (mIsDebugBuild && mSkipNdefRead) {
+ if (DBG) Log.d(TAG, "Only NDEF detection in reader mode");
+ tag.findNdef();
+ tag.startPresenceChecking(presenceCheckDelay, callback);
+ dispatchTagEndpoint(tag, readerParams);
+ break;
+ }
}
if (tag.getConnectedTechnology() == TagTechnology.NFC_BARCODE) {
diff --git a/src/com/android/nfc/beam/SendUi.java b/src/com/android/nfc/beam/SendUi.java
index 22457295..966d1376 100644
--- a/src/com/android/nfc/beam/SendUi.java
+++ b/src/com/android/nfc/beam/SendUi.java
@@ -66,6 +66,7 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import com.android.internal.policy.PhoneWindow;
+import com.android.internal.policy.SystemBarUtils;
import com.android.nfc.R;
import com.android.nfc.beam.FireflyRenderer;
import java.util.List;
@@ -362,8 +363,7 @@ public class SendUi implements Animator.AnimatorListener, View.OnTouchListener,
// Update display metrics
mDisplay.getRealMetrics(mDisplayMetrics);
- final int statusBarHeight = mContext.getResources().getDimensionPixelSize(
- com.android.internal.R.dimen.status_bar_height);
+ final int statusBarHeight = SystemBarUtils.getStatusBarHeight(mContext);
mBlackLayer.setVisibility(View.GONE);
mBlackLayer.setAlpha(0f);
@@ -595,8 +595,7 @@ public class SendUi implements Animator.AnimatorListener, View.OnTouchListener,
Bitmap createScreenshot() {
boolean hasNavBar = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_showNavigationBar);
- final int statusBarHeight = mContext.getResources().getDimensionPixelSize(
- com.android.internal.R.dimen.status_bar_height);
+ final int statusBarHeight = SystemBarUtils.getStatusBarHeight(mContext);
// Navbar has different sizes, depending on orientation
final int navBarHeight = hasNavBar ? mContext.getResources().getDimensionPixelSize(
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 20:32:25 +0000