PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't show tap&pay if NFC is off.

Browse Source 
Bug: 11007036
Change-Id: Ie19609fa928b2806c76b8bd94cdfd1872b9da032
This commit is contained in:
Martijn Coenen
2013-09-30 12:07:02 -07:00
parent 768dc8f729
commit 81ab81778b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/Settings.java
View File

@@ -32,6 +32,7 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.nfc.NfcAdapter;
import android.os.Bundle; import android.os.Bundle;
import android.os.INetworkManagementService; import android.os.INetworkManagementService;
import android.os.RemoteException; import android.os.RemoteException;
@@ -574,8 +575,15 @@ public class Settings extends PreferenceActivity
target.remove(i); target.remove(i);
} }
} else if (id == R.id.nfc_payment_settings) { } else if (id == R.id.nfc_payment_settings) {
if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC_HCE)) { if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC)) {
target.remove(i); 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) { } else if (id == R.id.development_settings) {
if (!showDev) { if (!showDev) {