LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NPE in BeamDemo if NFC not present.

Browse Source 
Bug: 6711303
Change-Id: Iad6abab3ea2ca53247ed4e3b5149e052bd92453b
This commit is contained in:
Martijn Coenen
2012-06-21 15:26:04 -07:00
parent 547975cf50
commit 76aca97d26
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/AndroidBeamDemo/src/com/example/android/beam/Beam.java
View File

@@ -56,12 +56,13 @@ public class Beam extends Activity implements CreateNdefMessageCallback,
if (mNfcAdapter == null) { if (mNfcAdapter == null) {
mInfoText = (TextView) findViewById(R.id.textView); mInfoText = (TextView) findViewById(R.id.textView);
mInfoText.setText("NFC is not available on this device."); mInfoText.setText("NFC is not available on this device.");
} } else {
// Register callback to set NDEF message // Register callback to set NDEF message
mNfcAdapter.setNdefPushMessageCallback(this, this); mNfcAdapter.setNdefPushMessageCallback(this, this);
// Register callback to listen for message-sent success // Register callback to listen for message-sent success
mNfcAdapter.setOnNdefPushCompleteCallback(this, this); mNfcAdapter.setOnNdefPushCompleteCallback(this, this);
} }
}
/** /**