diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2014-12-14 12:22:31 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-05 12:14:11 -0800 |
| commit | e880022abeb16a0576495b6d5e0433de40573269 (patch) | |
| tree | fb4bd1a17ecdc9fc84ceed752a195415a77af2b0 | |
| parent | 2c10e9a62501786ec6fa676decdd266285ef1405 (diff) | |
| download | android_packages_apps_Bluetooth-e880022abeb16a0576495b6d5e0433de40573269.tar.gz android_packages_apps_Bluetooth-e880022abeb16a0576495b6d5e0433de40573269.tar.bz2 android_packages_apps_Bluetooth-e880022abeb16a0576495b6d5e0433de40573269.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 5adad6994..831ea811d 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java +++ b/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java @@ -395,7 +395,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; |