diff options
| author | Emily Bernier <ember@google.com> | 2013-04-06 19:00:25 -0400 |
|---|---|---|
| committer | Emily Bernier <ember@google.com> | 2013-04-08 13:25:18 -0400 |
| commit | cf4ef456bbf2c10f674b291ef7960af8b6bf6efa (patch) | |
| tree | d7ca5acbad192fc80a4dab87c3a9b0687fabf0ce | |
| parent | e9a5b789db1a0a437073d20820be6266920cc7e8 (diff) | |
| download | android_packages_apps_Nfc-cf4ef456bbf2c10f674b291ef7960af8b6bf6efa.tar.gz android_packages_apps_Nfc-cf4ef456bbf2c10f674b291ef7960af8b6bf6efa.tar.bz2 android_packages_apps_Nfc-cf4ef456bbf2c10f674b291ef7960af8b6bf6efa.zip | |
Fixing NFC bug when confirm screen isn't required.
Change-Id: I198235ec91d454dabe34187bb51870cf1b0d4fb5
| -rwxr-xr-x | src/com/android/nfc/P2pLinkManager.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/nfc/P2pLinkManager.java b/src/com/android/nfc/P2pLinkManager.java index 9b0052d9..6c6a1b87 100755 --- a/src/com/android/nfc/P2pLinkManager.java +++ b/src/com/android/nfc/P2pLinkManager.java @@ -310,6 +310,7 @@ public class P2pLinkManager implements Handler.Callback, P2pEventListener.Callba // since Jelly Bean. if ((mSendFlags & NfcAdapter.FLAG_NDEF_PUSH_NO_CONFIRM) != 0) { mSendState = SEND_STATE_SENDING; + onP2pSendConfirmed(false); } else { mSendState = SEND_STATE_NEED_CONFIRMATION; if (DBG) Log.d(TAG, "onP2pSendConfirmationRequested()"); @@ -1003,9 +1004,14 @@ public class P2pLinkManager implements Handler.Callback, P2pEventListener.Callba @Override public void onP2pSendConfirmed() { + onP2pSendConfirmed(true); + } + + private void onP2pSendConfirmed(boolean requireConfirmation) { if (DBG) Log.d(TAG, "onP2pSendConfirmed()"); synchronized (this) { - if (mLinkState == LINK_STATE_DOWN || mSendState != SEND_STATE_NEED_CONFIRMATION) { + if (mLinkState == LINK_STATE_DOWN || (requireConfirmation + && mSendState != SEND_STATE_NEED_CONFIRMATION)) { return; } mSendState = SEND_STATE_SENDING; |