diff options
| author | Yuka Anami <yuka.x.anami@sonymobile.com> | 2013-12-26 21:40:05 +0900 |
|---|---|---|
| committer | Andres Morales <anmorales@google.com> | 2014-03-14 23:17:39 +0000 |
| commit | 57198e18138421ba93eda08ff6dc880de213e80a (patch) | |
| tree | 50d126b58b2007a8874cab4caa05cdae29346d40 | |
| parent | 056f130cc88deb8f448e2e0adeeb229b249e1ff2 (diff) | |
| download | android_packages_apps_Nfc-57198e18138421ba93eda08ff6dc880de213e80a.tar.gz android_packages_apps_Nfc-57198e18138421ba93eda08ff6dc880de213e80a.tar.bz2 android_packages_apps_Nfc-57198e18138421ba93eda08ff6dc880de213e80a.zip | |
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
| -rw-r--r-- | src/com/android/nfc/cardemulation/RegisteredAidCache.java | 5 |
1 files changed, 4 insertions, 1 deletions
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()); |