diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2014-12-14 12:22:31 -0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2015-04-10 16:10:22 -0700 |
| commit | 8500758000ea4c455e0d74507d4ab1ae4913edb6 (patch) | |
| tree | 12db5e00ab0ae09354ab7dbf171be5f97fe4f411 | |
| parent | 998a0bc32f1e5c4054a02963ecf6f07a7cc7662e (diff) | |
| download | android_packages_apps_Bluetooth-8500758000ea4c455e0d74507d4ab1ae4913edb6.tar.gz android_packages_apps_Bluetooth-8500758000ea4c455e0d74507d4ab1ae4913edb6.tar.bz2 android_packages_apps_Bluetooth-8500758000ea4c455e0d74507d4ab1ae4913edb6.zip | |
Prevent duplicate OPP permission request dialogs
When multiple files are sent in a single OPP session, the user should be
prompted to accept/reject only once.
Bug: 17770561
Change-Id: I438116915883c5fdc2d743f13456006f66511c0f
| -rw-r--r-- | src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java b/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java index dfbc707be..81c591b35 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java +++ b/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java @@ -364,7 +364,8 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler implemen boolean needConfirm = true; /** It's not first put if !serverBlocking, so we auto accept it */ - if (!mServerBlocking && mAccepted == BluetoothShare.USER_CONFIRMATION_CONFIRMED) { + if (!mServerBlocking && (mAccepted == BluetoothShare.USER_CONFIRMATION_CONFIRMED || + mAccepted == BluetoothShare.USER_CONFIRMATION_AUTO_CONFIRMED)) { values.put(BluetoothShare.USER_CONFIRMATION, BluetoothShare.USER_CONFIRMATION_AUTO_CONFIRMED); needConfirm = false; |