diff options
author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-06-03 02:21:33 +0100 |
---|---|---|
committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-06-03 02:21:33 +0100 |
commit | 5ef7049e6faa0fc0aaeef642c7a96c4d1866228c (patch) | |
tree | 9b0d723387ed3176041dccec9e3c7b3abb5183e8 | |
parent | 145748544747e4e077916b88f886c89e78afd805 (diff) | |
parent | d755ed47fb9b365d45e8e923e86d4cf70fd42782 (diff) | |
download | android_packages_apps_Nfc-5ef7049e6faa0fc0aaeef642c7a96c4d1866228c.tar.gz android_packages_apps_Nfc-5ef7049e6faa0fc0aaeef642c7a96c4d1866228c.tar.bz2 android_packages_apps_Nfc-5ef7049e6faa0fc0aaeef642c7a96c4d1866228c.zip |
Merge tag 'android-4.4.3_r1' into HEAD
Android 4.4.3 release 1
-rw-r--r-- | nci/jni/RoutingManager.cpp | 4 | ||||
-rw-r--r-- | res/values-da/strings.xml | 2 | ||||
-rw-r--r-- | res/values-zu/strings.xml | 21 | ||||
-rw-r--r-- | src/com/android/nfc/cardemulation/RegisteredAidCache.java | 5 |
4 files changed, 14 insertions, 18 deletions
diff --git a/nci/jni/RoutingManager.cpp b/nci/jni/RoutingManager.cpp index 83e97d0a..5577f503 100644 --- a/nci/jni/RoutingManager.cpp +++ b/nci/jni/RoutingManager.cpp @@ -120,7 +120,7 @@ bool RoutingManager::addAidRouting(const UINT8* aid, UINT8 aidLen, int route) return true; } else { - ALOGE ("%s: failed to route AID"); + ALOGE ("%s: failed to route AID", fn); return false; } } @@ -136,7 +136,7 @@ bool RoutingManager::removeAidRouting(const UINT8* aid, UINT8 aidLen) return true; } else { - ALOGE ("%s: failed to remove AID"); + ALOGE ("%s: failed to remove AID", fn); return false; } } diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 5e64735c..bf83bb45 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -35,5 +35,5 @@ <string name="could_not_use_app" msgid="8137587876138569083">"Kunne ikke fuldføres med <xliff:g id="APP">%1$s</xliff:g>."</string> <string name="pay_with" msgid="5531545488795798945">"Betal med"</string> <string name="complete_with" msgid="6797459104103012992">"Fuldfør med"</string> - <string name="default_pay_app_removed" msgid="4108250545457437360">"Din foretrukne tjeneste til Peg og betal blev fjernet. Vil du vælge en anden?"</string> + <string name="default_pay_app_removed" msgid="4108250545457437360">"Din foretrukne tjeneste til Tryk og betal blev fjernet. Vil du vælge en anden?"</string> </resources> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 4fa58b13..42db0205 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -29,18 +29,11 @@ <string name="confirm_pairing" msgid="4112568077038265363">"Ingabe unesiqinisekiso sokuthi ufuna ukuhambisa ngakubili idivayisi <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ye-Bluetooth?"</string> <string name="pair_yes" msgid="3525614878559994448">"Yebo"</string> <string name="pair_no" msgid="5022308368904055020">"Cha"</string> - <!-- no translation found for tap_again_to_pay (5754988005412859897) --> - <skip /> - <!-- no translation found for tap_again_to_complete (5423640945118279123) --> - <skip /> - <!-- no translation found for transaction_failure (7828102078637936513) --> - <skip /> - <!-- no translation found for could_not_use_app (8137587876138569083) --> - <skip /> - <!-- no translation found for pay_with (5531545488795798945) --> - <skip /> - <!-- no translation found for complete_with (6797459104103012992) --> - <skip /> - <!-- no translation found for default_pay_app_removed (4108250545457437360) --> - <skip /> + <string name="tap_again_to_pay" msgid="5754988005412859897">"Phinda uthephe ukuze ukhokhe nge-<xliff:g id="APP">%1$s</xliff:g>"</string> + <string name="tap_again_to_complete" msgid="5423640945118279123">"Phinda uthephe ukuze uqedelele nge-<xliff:g id="APP">%1$s</xliff:g>"</string> + <string name="transaction_failure" msgid="7828102078637936513">"Le nkokhelo ayikwazanga ukuqedelelwa nge-<xliff:g id="APP">%1$s</xliff:g>."</string> + <string name="could_not_use_app" msgid="8137587876138569083">"Ayikwazanga ukusebenzisa i-<xliff:g id="APP">%1$s</xliff:g>."</string> + <string name="pay_with" msgid="5531545488795798945">"Khokha nge-"</string> + <string name="complete_with" msgid="6797459104103012992">"Gcwalisa nge-"</string> + <string name="default_pay_app_removed" msgid="4108250545457437360">"Isevisi yakho oyincamelayo yokuthepha ukhokhe isusiwe. Khetha enye?"</string> </resources> diff --git a/src/com/android/nfc/cardemulation/RegisteredAidCache.java b/src/com/android/nfc/cardemulation/RegisteredAidCache.java index ff426846..e3607743 100644 --- a/src/com/android/nfc/cardemulation/RegisteredAidCache.java +++ b/src/com/android/nfc/cardemulation/RegisteredAidCache.java @@ -161,7 +161,10 @@ public class RegisteredAidCache implements RegisteredServicesCache.Callback { synchronized (mLock) { resolveInfo = mAidCache.get(aid); } - if (resolveInfo.services == null || resolveInfo.services.size() == 0) return false; + if (resolveInfo == null || resolveInfo.services == null || + resolveInfo.services.size() == 0) { + return false; + } if (resolveInfo.defaultService != null) { return service.equals(resolveInfo.defaultService.getComponent()); |