commit 57198e18138421ba93eda08ff6dc880de213e80a
author Yuka Anami <yuka.x.anami@sonymobile.com> Thu Dec 26 21:40:05 2013 +0900
committer Andres Morales <anmorales@google.com> Fri Mar 14 23:17:39 2014 +0000
tree 50d126b58b2007a8874cab4caa05cdae29346d40
parent 056f130cc88deb8f448e2e0adeeb229b249e1ff2

DO NOT MERGE Fix NPE in RegisteredAidCache

If the specified AID is not matched to any of mAidCache's keys,
the HashMap returns null and then NullPointerException occurs.

Bug: 13322965
Change-Id: I0d97aab0e47a6c6e7cbdb2426173038f4194c457

src/com/android/nfc/cardemulation/RegisteredAidCache.java

diff --git a/src/com/android/nfc/cardemulation/RegisteredAidCache.java b/src/com/android/nfc/cardemulation/RegisteredAidCache.java
index ff42684..e360774 100644
--- a/src/com/android/nfc/cardemulation/RegisteredAidCache.java
+++ b/src/com/android/nfc/cardemulation/RegisteredAidCache.java
@@ -161,7 +161,10 @@
         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());