Merge "Set default value for T3T_PMM." into oc-dr1-dev (1ce17014) · Commits · e / os / android_frameworks_base

core/java/android/nfc/cardemulation/NfcFServiceInfo.java

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -44,6 +44,8 @@ import java.io.PrintWriter;
	public final class NfcFServiceInfo implements Parcelable {		public final class NfcFServiceInfo implements Parcelable {
	static final String TAG = "NfcFServiceInfo";		static final String TAG = "NfcFServiceInfo";

			private static final String DEFAULT_T3T_PMM = "FFFFFFFFFFFFFFFF";

	/**		/**
	* The service that implements this		* The service that implements this
	*/		*/
	@@ -173,16 +175,12 @@ public final class NfcFServiceInfo implements Parcelable {
	com.android.internal.R.styleable.T3tPmmFilter);		com.android.internal.R.styleable.T3tPmmFilter);
	t3tPmm = a.getString(		t3tPmm = a.getString(
	com.android.internal.R.styleable.T3tPmmFilter_name).toUpperCase();		com.android.internal.R.styleable.T3tPmmFilter_name).toUpperCase();
	if (t3tPmm == null) {
	String defaultT3tPmm = "FFFFFFFFFFFFFFFF";
	t3tPmm = defaultT3tPmm;
	}
	a.recycle();		a.recycle();
	}		}
	}		}
	mSystemCode = (systemCode == null ? "NULL" : systemCode);		mSystemCode = (systemCode == null ? "NULL" : systemCode);
	mNfcid2 = (nfcid2 == null ? "NULL" : nfcid2);		mNfcid2 = (nfcid2 == null ? "NULL" : nfcid2);
	mT3tPmm = (t3tPmm == null ? "NULL" : t3tPmm);		mT3tPmm = (t3tPmm == null ? DEFAULT_T3T_PMM : t3tPmm);
	} catch (NameNotFoundException e) {		} catch (NameNotFoundException e) {
	throw new XmlPullParserException("Unable to create context for: " + si.packageName);		throw new XmlPullParserException("Unable to create context for: " + si.packageName);
	} finally {		} finally {