diff options
| author | Martijn Coenen <maco@google.com> | 2012-05-21 12:45:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-21 12:45:06 -0700 |
| commit | d47de4a5de519ffd56aefb04c37537a9c1fc2275 (patch) | |
| tree | 41a1d509cc2469dfd48eade16f86e0911de03317 /src | |
| parent | 4e7293861f218e617c17d5af02ae9c797fc4a48c (diff) | |
| parent | 91ebf1e2e815034504265f1f7472780bcbd30123 (diff) | |
| download | android_packages_apps_Nfc-d47de4a5de519ffd56aefb04c37537a9c1fc2275.tar.gz android_packages_apps_Nfc-d47de4a5de519ffd56aefb04c37537a9c1fc2275.tar.bz2 android_packages_apps_Nfc-d47de4a5de519ffd56aefb04c37537a9c1fc2275.zip | |
am 91ebf1e2: am 0f2b555f: Don\'t use NPP for connection handover.
* commit '91ebf1e2e815034504265f1f7472780bcbd30123':
Don't use NPP for connection handover.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/nfc/P2pLinkManager.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/nfc/P2pLinkManager.java b/src/com/android/nfc/P2pLinkManager.java index ecded756..2f70f398 100755 --- a/src/com/android/nfc/P2pLinkManager.java +++ b/src/com/android/nfc/P2pLinkManager.java @@ -405,7 +405,11 @@ public class P2pLinkManager implements Handler.Callback, P2pEventListener.Callba return null; } - result = new NdefPushClient().push(m); + if (m != null) { + result = new NdefPushClient().push(m); + } else { + result = false; + } } time = SystemClock.elapsedRealtime() - time; |