From 0c3d438a930d905e23ba2148ffccdbdc03851189 Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Thu, 21 Jun 2012 15:26:04 -0700 Subject: [PATCH] Fix NPE in BeamDemo if NFC not present. do not merge. Bug: 6711303 (cherry picked from commit 76aca97d265db9c2da7ce17451502b98214031e9) Change-Id: I626d060bf2951c213679685dc57ee2eda7398da2 --- .../src/com/example/android/beam/Beam.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/samples/AndroidBeamDemo/src/com/example/android/beam/Beam.java b/samples/AndroidBeamDemo/src/com/example/android/beam/Beam.java index d419bacbe..79019abfd 100644 --- a/samples/AndroidBeamDemo/src/com/example/android/beam/Beam.java +++ b/samples/AndroidBeamDemo/src/com/example/android/beam/Beam.java @@ -56,11 +56,12 @@ public class Beam extends Activity implements CreateNdefMessageCallback, if (mNfcAdapter == null) { mInfoText = (TextView) findViewById(R.id.textView); mInfoText.setText("NFC is not available on this device."); + } else { + // Register callback to set NDEF message + mNfcAdapter.setNdefPushMessageCallback(this, this); + // Register callback to listen for message-sent success + mNfcAdapter.setOnNdefPushCompleteCallback(this, this); } - // Register callback to set NDEF message - mNfcAdapter.setNdefPushMessageCallback(this, this); - // Register callback to listen for message-sent success - mNfcAdapter.setOnNdefPushCompleteCallback(this, this); }