| commit | 99e644eb53e68560cf50a69125412809b3228101 | [log] [tgz] |
|---|---|---|
| author | Yuichi Araki <yaraki@google.com> | Wed Mar 25 12:34:39 2015 +0900 |
| committer | Yuichi Araki <yaraki@google.com> | Wed Mar 25 12:36:33 2015 +0900 |
| tree | 04e36941295d678ac3fbc740d1a0178573d0e2b5 | |
| parent | 65619677d07c41b6bc449292386b15ef7c96da5e [diff] |
NfcProvisioning: Fix NPE on devices without NFC This sample is basically useless on devices without NFC, but we need this just to make tests pass on the emulator running on our CI server. Bug: 19918931 Change-Id: I80db8e5fbf84c78039ecde52f2b4131bf0bb52d7
diff --git a/admin/NfcProvisioning/Application/src/main/java/com/example/android/nfcprovisioning/NfcProvisioningFragment.java b/admin/NfcProvisioning/Application/src/main/java/com/example/android/nfcprovisioning/NfcProvisioningFragment.java index e3b14c6..f46d0f2 100644 --- a/admin/NfcProvisioning/Application/src/main/java/com/example/android/nfcprovisioning/NfcProvisioningFragment.java +++ b/admin/NfcProvisioning/Application/src/main/java/com/example/android/nfcprovisioning/NfcProvisioningFragment.java
@@ -94,7 +94,9 @@ super.onStart(); Activity activity = getActivity(); NfcAdapter adapter = NfcAdapter.getDefaultAdapter(activity); - adapter.setNdefPushMessageCallback(this, activity); + if (adapter != null) { + adapter.setNdefPushMessageCallback(this, activity); + } getLoaderManager().initLoader(LOADER_PROVISIONING_VALUES, null, this); }