summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xnci/jni/NativeNfcManager.cpp3
-rw-r--r--nxp/jni/com_android_nfc_NativeNfcManager.cpp2
-rw-r--r--res/values-cs/strings.xml2
-rw-r--r--res/values-sk/strings.xml2
-rw-r--r--res/values-tr/strings.xml4
-rw-r--r--src/com/android/nfc/cardemulation/RegisteredAidCache.java12
6 files changed, 12 insertions, 13 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index 9772dc42..8d27c3bc 100755
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -141,7 +141,7 @@ static bool sIsSecElemSelected = false; //has NFC service selec
| NFA_TECHNOLOGY_MASK_F_ACTIVE \
| NFA_TECHNOLOGY_MASK_KOVIO)
#define DEFAULT_DISCOVERY_DURATION 500
-#define READER_MODE_DISCOVERY_DURATION 100
+#define READER_MODE_DISCOVERY_DURATION 200
static void nfaConnectionCallback (UINT8 event, tNFA_CONN_EVT_DATA *eventData);
static void nfaDeviceManagementCallback (UINT8 event, tNFA_DM_CBACK_DATA *eventData);
@@ -1290,6 +1290,7 @@ static jboolean nfcManager_doDeinitialize (JNIEnv*, jobject)
sDiscoveryEnabled = false;
sIsDisabling = false;
sIsSecElemSelected = false;
+ gActivated = false;
{
//unblock NFA_EnablePolling() and NFA_DisablePolling()
diff --git a/nxp/jni/com_android_nfc_NativeNfcManager.cpp b/nxp/jni/com_android_nfc_NativeNfcManager.cpp
index e8fedfae..81d79c13 100644
--- a/nxp/jni/com_android_nfc_NativeNfcManager.cpp
+++ b/nxp/jni/com_android_nfc_NativeNfcManager.cpp
@@ -2437,7 +2437,7 @@ static void com_android_nfc_NfcManager_doEnableReaderMode(JNIEnv *e, jobject o,
nat->p2p_initiator_modes = 0;
nat->p2p_target_modes = 0;
nat->discovery_cfg.PollDevInfo.PollCfgInfo.DisableCardEmulation = TRUE;
- nat->discovery_cfg.Duration = 100000; /* in ms */
+ nat->discovery_cfg.Duration = 200000; /* in ms */
nat->discovery_cfg.PollDevInfo.PollCfgInfo.EnableIso14443A = (modes & 0x01) != 0;
nat->discovery_cfg.PollDevInfo.PollCfgInfo.EnableIso14443B = (modes & 0x02) != 0;
nat->discovery_cfg.PollDevInfo.PollCfgInfo.EnableFelica212 = (modes & 0x04) != 0;
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0fb0d990..e2bc6ffd 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -35,5 +35,5 @@
<string name="could_not_use_app" msgid="8137587876138569083">"Aplikaci <xliff:g id="APP">%1$s</xliff:g> nelze použít."</string>
<string name="pay_with" msgid="5531545488795798945">"Zaplatit pomocí"</string>
<string name="complete_with" msgid="6797459104103012992">"Dokončit pomocí"</string>
- <string name="default_pay_app_removed" msgid="4108250545457437360">"Preferovaná služba pro bezkontakní platbu telefonem byla odstraněna. Chcete vybrat jinou?"</string>
+ <string name="default_pay_app_removed" msgid="4108250545457437360">"Preferovaná služba pro platbu mobilem byla odstraněna. Chcete vybrat jinou?"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 6941d44e..d0e08cd0 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -35,5 +35,5 @@
<string name="could_not_use_app" msgid="8137587876138569083">"Aplikáciu <xliff:g id="APP">%1$s</xliff:g> nie je možné použiť."</string>
<string name="pay_with" msgid="5531545488795798945">"Zaplatiť pomocou"</string>
<string name="complete_with" msgid="6797459104103012992">"Dokončiť pomocou"</string>
- <string name="default_pay_app_removed" msgid="4108250545457437360">"Vaša uprednostňovaná služba pre platenie priložením bola odstránená. Vybrať inú?"</string>
+ <string name="default_pay_app_removed" msgid="4108250545457437360">"Vaša uprednostňovaná služba pre platby mobilom bola odstránená. Vybrať inú?"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b72679e2..38209a77 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -29,11 +29,11 @@
<string name="confirm_pairing" msgid="4112568077038265363">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> adlı Bluetooth cihazını eşlemek istediğinizden emin misiniz?"</string>
<string name="pair_yes" msgid="3525614878559994448">"Evet"</string>
<string name="pair_no" msgid="5022308368904055020">"Hayır"</string>
- <string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> ile ödemek için tekrar hafifçe vurun"</string>
+ <string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> ile ödemek için tekrar dokundurun"</string>
<string name="tap_again_to_complete" msgid="5423640945118279123">"<xliff:g id="APP">%1$s</xliff:g> ile tamamlamak için tekrar hafifçe vurun"</string>
<string name="transaction_failure" msgid="7828102078637936513">"Bu işlem <xliff:g id="APP">%1$s</xliff:g> ile tamamlanamadı."</string>
<string name="could_not_use_app" msgid="8137587876138569083">"<xliff:g id="APP">%1$s</xliff:g> kullanılamadı."</string>
<string name="pay_with" msgid="5531545488795798945">"Ödemeyi şu uygulamayla yap:"</string>
<string name="complete_with" msgid="6797459104103012992">"İşlemi şu uygulamayla tamamla:"</string>
- <string name="default_pay_app_removed" msgid="4108250545457437360">"Dokun ve öde özelliği için tercih ettiğiniz hizmet kaldırıldı. Başka bir hizmet seçmek ister misiniz?"</string>
+ <string name="default_pay_app_removed" msgid="4108250545457437360">"Dokundur ve öde özelliği için tercih ettiğiniz hizmet kaldırıldı. Başka bir hizmet seçmek ister misiniz?"</string>
</resources>
diff --git a/src/com/android/nfc/cardemulation/RegisteredAidCache.java b/src/com/android/nfc/cardemulation/RegisteredAidCache.java
index 165e53b6..7b45291a 100644
--- a/src/com/android/nfc/cardemulation/RegisteredAidCache.java
+++ b/src/com/android/nfc/cardemulation/RegisteredAidCache.java
@@ -260,7 +260,7 @@ public class RegisteredAidCache implements RegisteredServicesCache.Callback {
return null;
}
AidResolveInfo resolveInfo = new AidResolveInfo();
- Log.e(TAG, "resolveAidLocked: resolving AID " + aid);
+ if (DBG) Log.d(TAG, "resolveAidLocked: resolving AID " + aid);
resolveInfo.services = new ArrayList<ApduServiceInfo>();
resolveInfo.services.addAll(resolvedServices);
resolveInfo.defaultService = null;
@@ -279,7 +279,7 @@ public class RegisteredAidCache implements RegisteredServicesCache.Callback {
+ defaultComponent);
if (resolvedServices.size() == 1) {
ApduServiceInfo resolvedService = resolvedServices.get(0);
- Log.d(TAG, "resolveAidLocked: resolved single service " +
+ if (DBG) Log.d(TAG, "resolveAidLocked: resolved single service " +
resolvedService.getComponent());
if (defaultComponent != null &&
defaultComponent.equals(resolvedService.getComponent())) {
@@ -409,8 +409,6 @@ public class RegisteredAidCache implements RegisteredServicesCache.Callback {
}
boolean updateFromSettingsLocked(int userId) {
- boolean changed = false;
-
// Load current payment default from settings
String name = Settings.Secure.getStringForUser(
mContext.getContentResolver(), Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT,
@@ -418,10 +416,9 @@ public class RegisteredAidCache implements RegisteredServicesCache.Callback {
ComponentName newDefault = name != null ? ComponentName.unflattenFromString(name) : null;
ComponentName oldDefault = mCategoryDefaults.put(CardEmulation.CATEGORY_PAYMENT,
newDefault);
- changed |= newDefault != oldDefault;
if (DBG) Log.d(TAG, "Updating default component to: " + (name != null ?
ComponentName.unflattenFromString(name) : "null"));
- return changed;
+ return newDefault != oldDefault;
}
void generateAidCacheLocked() {
@@ -539,7 +536,7 @@ public class RegisteredAidCache implements RegisteredServicesCache.Callback {
void checkDefaultsLocked(int userId, List<ApduServiceInfo> services) {
ComponentName defaultPaymentService =
getDefaultServiceForCategory(userId, CardEmulation.CATEGORY_PAYMENT, false);
- Log.d(TAG, "Current default: " + defaultPaymentService);
+ if (DBG) Log.d(TAG, "Current default: " + defaultPaymentService);
if (defaultPaymentService != null) {
// Validate the default is still installed and handling payment
ApduServiceInfo serviceInfo = mServiceCache.getService(userId, defaultPaymentService);
@@ -558,6 +555,7 @@ public class RegisteredAidCache implements RegisteredServicesCache.Callback {
// in that case, automatically set that app as default.
setDefaultIfNeededLocked(userId, services);
}
+ updateFromSettingsLocked(userId);
}
@Override
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 11:02:14 +0000