commit f3ed1959f517dd5a896ee0f8af8837f0701a2903
author Ruchi Kandoi <kandoiruchi@google.com> Fri Oct 19 16:52:25 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 19 16:52:25 2018 +0000
tree 2e2892dceb8ade9b5d372422c6e9afb225a74001
parent 90cb31ab60d5f758ad55e708bff9a2ec709c72f8
parent 5058e49d9a4bcc6e54592a91f4a0def6ac69e858

Merge "Set BT OPP whitelist intent to foreground priority"

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);
     }