commit 5058e49d9a4bcc6e54592a91f4a0def6ac69e858
author Vicky Fan <vicky.fan@sonymobile.com> Thu Oct 18 14:15:22 2018 +0900
committer Hiroki Yamamoto <Hiroki.A.Yamamoto@sony.com> Thu Oct 18 05:27:06 2018 +0000
tree 2e2892dceb8ade9b5d372422c6e9afb225a74001
parent 8a0c6ff7ae3e541919372b6da6ff7975367dd591

Set BT OPP whitelist intent to foreground priority

If the device is in busy state, the whitelist intent may be delayed.
In that case, Bluetooth cannot know if the OPP is triggered by NFC.
Then user confirmation is required before file transfer.

Test: Receive a file via AndroidBeam
Bug: 117909547
Change-Id: I05a51e0f3931dd93cbb5db0b2fdda1f36d854ec5

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

diff --git a/src/com/android/nfc/beam/BeamManager.java b/src/com/android/nfc/beam/BeamManager.java
index 0334663..cf5f334 100644
--- a/src/com/android/nfc/beam/BeamManager.java
+++ b/src/com/android/nfc/beam/BeamManager.java
@@ -138,6 +138,7 @@
         Intent intent = new Intent(ACTION_WHITELIST_DEVICE);
         intent.setPackage(context.getString(R.string.bluetooth_package));
         intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
+        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
         context.sendBroadcastAsUser(intent, UserHandle.CURRENT);
     }
 

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

diff --git a/src/com/android/nfc/beam/BeamTransferManager.java b/src/com/android/nfc/beam/BeamTransferManager.java
index be20aad..08372b8 100644
--- a/src/com/android/nfc/beam/BeamTransferManager.java
+++ b/src/com/android/nfc/beam/BeamTransferManager.java
@@ -185,6 +185,7 @@
         Intent intent = new Intent(ACTION_WHITELIST_DEVICE);
         intent.setPackage(mContext.getString(R.string.bluetooth_package));
         intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
+        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
         mContext.sendBroadcastAsUser(intent, UserHandle.CURRENT);
     }