commit 9ed2d5f7460973409e44018f5fa7b3456db1e658
author Martijn Coenen <maco@google.com> Tue Sep 16 17:40:29 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 16 17:40:30 2014 +0000
tree ccd7a2a613b3dbd5a0dba635b34171f6aef36378
parent 7c9823ac4fe63e22962b48c46059ff89f539de5b
parent 0985fb6c428e75c083e930f895695ee4e9cbb4cb

Merge "Fix static AID prefix registration." into lmp-dev

core/java/android/nfc/cardemulation/ApduServiceInfo.java

diff --git a/core/java/android/nfc/cardemulation/ApduServiceInfo.java b/core/java/android/nfc/cardemulation/ApduServiceInfo.java
index 646134e..3811375 100644
--- a/core/java/android/nfc/cardemulation/ApduServiceInfo.java
+++ b/core/java/android/nfc/cardemulation/ApduServiceInfo.java
@@ -231,7 +231,7 @@
                     String aid = a.getString(com.android.internal.R.styleable.AidFilter_name).
                             toUpperCase();
                     // Add wildcard char to indicate prefix
-                    aid.concat("*");
+                    aid = aid.concat("*");
                     if (CardEmulation.isValidAid(aid) && !currentGroup.aids.contains(aid)) {
                         currentGroup.aids.add(aid);
                     } else {