Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505a

6 files changed, 21 insertions, 56 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-ku/strings.xml b/res/values-ku/strings.xml
new file mode 100644
index 00000000..120a3fd9
--- /dev/null
+++ b/res/values-ku/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="cancel">هەڵوەشاندنەوە</string>
+  <string name="pair_yes">بەڵێ</string>
+  <string name="pair_no">نەخێر</string>
+</resources>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
deleted file mode 100644
index 0c9f5f25..00000000
--- a/res/values-ug/strings.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="inbound_me_profile_title" msgid="6146013785225412693">"NFC ئارقىلىق ئالاقەداش قوبۇللىدى"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"چېكىلسە بۇ كىشىنى ئالاقەداشقا قوشىدۇ."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC تەسىرلىشىش تامام"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"چېكىپ بۇ كىشىگە ئالاقەداش ئۇچۇرىڭىزنى يوللىيالايسىز"</string>
-    <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC قوزغىتىلدى."</string>
-    <string name="touch" msgid="4727218133711188355">"چېكىسلە يوللايدۇ"</string>
-    <string name="beam_progress" msgid="7453634884807323920">"beam نى قوبۇللاۋاتىدۇ…"</string>
-    <string name="beam_outgoing" msgid="4679536649779123495">"Beam بىلەن ئۇچۇر يوللاۋاتىدۇ…"</string>
-    <string name="beam_complete" msgid="477026736424637435">"Beam تامام"</string>
-    <string name="beam_failed" msgid="5116241718189888630">"Beam تاماملانمىدى"</string>
-    <string name="beam_canceled" msgid="5425192751826544741">"Beam دىن ۋاز كەچتى"</string>
-    <string name="cancel" msgid="61873902552555096">"ۋاز كەچ"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"چېكىلسە كۆرسىتىدۇ"</string>
-    <string name="beam_handover_not_supported" msgid="4083165921751489015">"قوبۇللايدىغان ئۈسكۈنە Beam ئارقىلىق چوڭ ھۆججەت يوللاشنى قوللىمايدۇ."</string>
-    <string name="beam_try_again" msgid="3364677301009783455">"ئىككى ئۈسكۈنىنى قايتا يېقىنلاشتۇرۇڭ"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"باغلىنىۋاتىدۇ…"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"باغلاندى"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"باغلىنالمايدۇ"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"ئۈزۈۋاتىدۇ"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"ئۈزۈلدى"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"جۈپلەۋاتىدۇ"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"جۈپلىيەلمەيدۇ"</string>
-    <string name="failed_to_enable_bt" msgid="7229153323594758077">"كۆكچىشنى قوزغىتالمايدۇ"</string>
-    <string name="confirm_pairing" msgid="4112568077038265363">"كۆكچىش ئۈسكۈنە <xliff:g id="DEVICE_NAME">%1$s</xliff:g> بىلەن جۈپلەمسىز؟"</string>
-    <string name="pair_yes" msgid="3525614878559994448">"ھەئە"</string>
-    <string name="pair_no" msgid="5022308368904055020">"ياق"</string>
-    <string name="tap_again_to_pay" msgid="5754988005412859897">"قايتا چېكىپ <xliff:g id="APP">%1$s</xliff:g> ئارقىلىق پۇل تۆلىگىلى بولىدۇ"</string>
-    <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="complete_with" msgid="6797459104103012992">"تۆۋەندىكى ئەپتە تاماملايدۇ:"</string>
-    <string name="default_pay_app_removed" msgid="4108250545457437360">"چېكىپلا پۇل تۆلەيدىغان ئالدىنلىق مۇلازىمىتى چىقىرىۋېتىلگەن، باشقىسىنى تاللامسىز؟"</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());