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

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

Browse Source 
* commit '8a966a452d4ce8b2251a6e9607c64ab56a5d3d1e':
  Fix bug #17624121 Settings crash while launching on wiped device
This commit is contained in:
Fabrice Di Meglio
2014-09-23 20:38:12 +00:00
committed by Android Git Automerger
parent 7f397ef5cc 8a966a452d
commit 615a9f68fb
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 {
// 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)) {
if (adapter == null || !adapter.isEnabled() ||
!getPackageManager().hasSystemFeature(
PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {
removeTile = true;
}
}