Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set default value for T3T_PMM."

Browse Source
This commit is contained in:
Ruchi Kandoi
2017-08-01 20:30:50 +00:00
committed by Gerrit Code Review
parent 01d686b85e 0b5a37e876
commit 7770adf755
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/nfc/cardemulation/NfcFServiceInfo.java
View File

@@ -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 {