diff options
| author | 2017-08-01 20:03:44 +0000 | |
|---|---|---|
| committer | 2017-08-01 20:03:44 +0000 | |
| commit | 1ce17014cefbad510da55a8c56d9b0894e21195c (patch) | |
| tree | c6106e8bc3ed7db154a8d0cee431ebf5448cae99 | |
| parent | 47e6cc34bb23b4afea718e5dc925e75bb93fa277 (diff) | |
| parent | 756d93964db29d9bab8510f82df167aef3fef2ed (diff) | |
Merge "Set default value for T3T_PMM." into oc-dr1-dev
am: 756d93964d
Change-Id: Idf050b3f7a144a5074b33677269305d9eadd312d
| -rw-r--r-- | core/java/android/nfc/cardemulation/NfcFServiceInfo.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/core/java/android/nfc/cardemulation/NfcFServiceInfo.java b/core/java/android/nfc/cardemulation/NfcFServiceInfo.java index 4201935241d9..1d3f9c2e346e 100644 --- a/core/java/android/nfc/cardemulation/NfcFServiceInfo.java +++ b/core/java/android/nfc/cardemulation/NfcFServiceInfo.java @@ -44,6 +44,8 @@ import java.io.PrintWriter; public final class NfcFServiceInfo implements Parcelable { static final String TAG = "NfcFServiceInfo"; + private static final String DEFAULT_T3T_PMM = "FFFFFFFFFFFFFFFF"; + /** * The service that implements this */ @@ -173,16 +175,12 @@ public final class NfcFServiceInfo implements Parcelable { com.android.internal.R.styleable.T3tPmmFilter); t3tPmm = a.getString( com.android.internal.R.styleable.T3tPmmFilter_name).toUpperCase(); - if (t3tPmm == null) { - String defaultT3tPmm = "FFFFFFFFFFFFFFFF"; - t3tPmm = defaultT3tPmm; - } a.recycle(); } } mSystemCode = (systemCode == null ? "NULL" : systemCode); mNfcid2 = (nfcid2 == null ? "NULL" : nfcid2); - mT3tPmm = (t3tPmm == null ? "NULL" : t3tPmm); + mT3tPmm = (t3tPmm == null ? DEFAULT_T3T_PMM : t3tPmm); } catch (NameNotFoundException e) { throw new XmlPullParserException("Unable to create context for: " + si.packageName); } finally { |