commit 0c3d438a930d905e23ba2148ffccdbdc03851189
author Martijn Coenen <maco@google.com> Thu Jun 21 15:26:04 2012 -0700
committer Xavier Ducrohet <xav@android.com> Thu Jun 21 17:18:26 2012 -0700
tree b7cf4c0a7b71eef5c982b06a089cc86df384c748
parent ddb532df5831dd8067842b4ffaee241a2f9b2ce6

Fix NPE in BeamDemo if NFC not present. do not merge.

Bug: 6711303

(cherry picked from commit 76aca97d265db9c2da7ce17451502b98214031e9)

Change-Id: I626d060bf2951c213679685dc57ee2eda7398da2

samples/AndroidBeamDemo/src/com/example/android/beam/Beam.java

diff --git a/samples/AndroidBeamDemo/src/com/example/android/beam/Beam.java b/samples/AndroidBeamDemo/src/com/example/android/beam/Beam.java
index d419bac..79019ab 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 @@
         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);
     }