am 0c3d438a: Fix NPE in BeamDemo if NFC not present. do not merge.

* commit '0c3d438a930d905e23ba2148ffccdbdc03851189':
  Fix NPE in BeamDemo if NFC not present. do not merge.
This commit is contained in:
Martijn Coenen
2012-06-21 17:20:59 -07:00
committed by Android Git Automerger

View File

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