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

am 575a4d2a: Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev

Browse Source 
* commit '575a4d2a19e0d3e3b052c936ce973d30c8b63be6':
  Fix bug #17624121 Settings crash while launching on wiped device
This commit is contained in:
Fabrice Di Meglio
2014-09-23 20:27:19 +00:00
committed by Android Git Automerger
parent a205445be2 575a4d2a19
commit 8a966a452d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/SettingsActivity.java
View File

@@ -1177,8 +1177,9 @@ public class SettingsActivity extends Activity
} else { } else {
// Only show if NFC is on and we have the HCE feature // Only show if NFC is on and we have the HCE feature
NfcAdapter adapter = NfcAdapter.getDefaultAdapter(this); NfcAdapter adapter = NfcAdapter.getDefaultAdapter(this);
if (!adapter.isEnabled() || !getPackageManager().hasSystemFeature( if (adapter == null || !adapter.isEnabled() ||
PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) { !getPackageManager().hasSystemFeature(
PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {
removeTile = true; removeTile = true;
} }
} }