commit 76aca97d265db9c2da7ce17451502b98214031e9
author Martijn Coenen <maco@google.com> Thu Jun 21 15:26:04 2012 -0700
committer Martijn Coenen <maco@google.com> Thu Jun 21 15:26:47 2012 -0700
tree 7a9f3258c1e8d8e7fa84a23d6e844d23df5b2d36
parent 547975cf50510a94caf0c1d247e8d3192b5c0d85

Fix NPE in BeamDemo if NFC not present.

Bug: 6711303
Change-Id: Iad6abab3ea2ca53247ed4e3b5149e052bd92453b

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);
     }