diff options
| author | george.kg_chang <george.kg_chang@htc.com> | 2016-06-24 11:08:41 +0800 |
|---|---|---|
| committer | Aarthi Thiruvengadam <athiru@google.com> | 2016-06-27 12:28:39 -0700 |
| commit | 1c517e0f7d2162ec6bfbda964adf45ca69faa694 (patch) | |
| tree | f1ad8ba26c51269310e493f17f6b1cd1d3e63069 | |
| parent | 5ebfc448ec5649473aa78e16aa516fa5a175ffaf (diff) | |
| download | android_packages_apps_Nfc-1c517e0f7d2162ec6bfbda964adf45ca69faa694.tar.gz android_packages_apps_Nfc-1c517e0f7d2162ec6bfbda964adf45ca69faa694.tar.bz2 android_packages_apps_Nfc-1c517e0f7d2162ec6bfbda964adf45ca69faa694.zip | |
Fix Nfc beam status that is stuck in wrong state
Bug: 29343365
Change-Id: I561bd02fa770b21320702491f882c09c85b08ebb
Signed-off-by: george.kg_chang <george.kg_chang@htc.com>
| -rw-r--r-- | src/com/android/nfc/beam/BeamTransferManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/nfc/beam/BeamTransferManager.java b/src/com/android/nfc/beam/BeamTransferManager.java index a082d8fd..e05c223d 100644 --- a/src/com/android/nfc/beam/BeamTransferManager.java +++ b/src/com/android/nfc/beam/BeamTransferManager.java @@ -251,7 +251,8 @@ public class BeamTransferManager implements Handler.Callback, } public boolean isRunning() { - if (mState != STATE_NEW && mState != STATE_IN_PROGRESS && mState != STATE_W4_NEXT_TRANSFER) { + if (mState != STATE_NEW && mState != STATE_IN_PROGRESS && mState != STATE_W4_NEXT_TRANSFER + && mState != STATE_CANCELLING) { return false; } else { return true; |