commit e94a667d845bfa7c1c6f8aab4d4cfa57cf8d3bd7
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 17 20:09:20 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 17 20:09:20 2018 +0000
tree 8476288821234d57a19a4aea1a25589b966153f0
parent af3dab04d6c391502b0e3c1cca9c72299fadacec
parent 5665ec56f3d65e39cc37eb93eb82296380cd2d2f

Merge "Fix Android Beam stop working during repetition"

src/com/android/nfc/P2pEventManager.java

diff --git a/src/com/android/nfc/P2pEventManager.java b/src/com/android/nfc/P2pEventManager.java
index 1f84947..faec610 100644
--- a/src/com/android/nfc/P2pEventManager.java
+++ b/src/com/android/nfc/P2pEventManager.java
@@ -207,4 +207,11 @@
         mInDebounce = false;
     }
 
+    @Override
+    public boolean isP2pIdle() {
+        if (mSendUi != null && !mSendUi.isSendUiInIdleState()) {
+            return false;
+        }
+        return true;
+    }
 }

src/com/android/nfc/P2pLinkManager.java

diff --git a/src/com/android/nfc/P2pLinkManager.java b/src/com/android/nfc/P2pLinkManager.java
index 3dd601b..d34ad20 100755
--- a/src/com/android/nfc/P2pLinkManager.java
+++ b/src/com/android/nfc/P2pLinkManager.java
@@ -132,6 +132,11 @@
      */
     public void onP2pOutOfRange();
 
+    /**
+     * Indicates the P2P Beam UI is in idle mode.
+     */
+    public boolean isP2pIdle();
+
     public interface Callback {
         public void onP2pSendConfirmed();
         public void onP2pCanceled();
@@ -442,6 +447,10 @@
             mPeerLlcpVersion = peerLlcpVersion;
             switch (mLinkState) {
                 case LINK_STATE_DOWN:
+                    if (!mEventListener.isP2pIdle() && mSendState != SEND_STATE_PENDING) {
+                        break;
+                    }
+
                     if (DBG) Log.d(TAG, "onP2pInRange()");
                     // Start taking a screenshot
                     mEventListener.onP2pInRange();

src/com/android/nfc/beam/SendUi.java

diff --git a/src/com/android/nfc/beam/SendUi.java b/src/com/android/nfc/beam/SendUi.java
index 7e3fb38..ab35467 100644
--- a/src/com/android/nfc/beam/SendUi.java
+++ b/src/com/android/nfc/beam/SendUi.java
@@ -877,6 +877,10 @@
     public void onActionModeFinished(ActionMode mode) {
     }
 
+    public boolean isSendUiInIdleState() {
+        return mState == STATE_IDLE;
+    }
+
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {