Merge "Don't show tap&pay if NFC is off." into klp-dev (028b6b3f) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/Settings.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import android.content.pm.PackageManager;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.content.pm.ResolveInfo;
		import android.graphics.drawable.Drawable;
		import android.nfc.NfcAdapter;
		import android.os.Bundle;
		import android.os.INetworkManagementService;
		import android.os.RemoteException;
		@@ -574,8 +575,15 @@ public class Settings extends PreferenceActivity
		target.remove(i);
		}
		} else if (id == R.id.nfc_payment_settings) {
		if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC_HCE)) {
		if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC)) {
		target.remove(i);
		} else {
		// Only show if NFC is on and we have the HCE feature
		NfcAdapter adapter = NfcAdapter.getDefaultAdapter(this);
		if (!adapter.isEnabled() \|\| !getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {
		target.remove(i);
		}
		}
		} else if (id == R.id.development_settings) {
		if (!showDev) {