commit 16fe3488b20e3b79a45a17e2e81627ce818e9f6e
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 10 03:49:32 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 10 03:49:32 2022 +0000
tree aad0684bffc74dab507e1033ce4ff82c7fbf6172
parent bd84ddec84a14dc4878ad80f9db299c1a673da0e
parent 463cb9b6874130ae1ccc7bafe162ffac3933bfd4

Merge "Refine delay polling control flow"

src/com/android/nfc/NfcService.java

diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index a7459e1..3b13de1 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -3108,10 +3108,10 @@
                     unregisterObject(tagEndpoint.getHandle());
                     if (mPollDelay > NO_POLL_DELAY) {
                         tagEndpoint.stopPresenceChecking();
-                        mDeviceHost.startStopPolling(false);
                         synchronized (NfcService.this) {
                             if (!mPollingDelayed) {
                                 mPollingDelayed = true;
+                                mDeviceHost.startStopPolling(false);
                                 if (DBG) Log.d(TAG, "Polling delayed");
                                 mHandler.sendMessageDelayed(
                                         mHandler.obtainMessage(MSG_DELAY_POLLING), mPollDelay);