diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2014-12-14 12:22:31 -0800 |
|---|---|---|
| committer | Andre Eisenbach <eisenbach@google.com> | 2014-12-14 12:22:31 -0800 |
| commit | 01b3991ff968cbc8300fdaf42bbe3f5614ac4c56 (patch) | |
| tree | 3fb5bcc65de31de9423a07e091d8976f19a94d74 /src | |
| parent | 75f77e9970a4b4492e025257fccefcce612bc501 (diff) | |
| download | android_packages_apps_Bluetooth-01b3991ff968cbc8300fdaf42bbe3f5614ac4c56.tar.gz android_packages_apps_Bluetooth-01b3991ff968cbc8300fdaf42bbe3f5614ac4c56.tar.bz2 android_packages_apps_Bluetooth-01b3991ff968cbc8300fdaf42bbe3f5614ac4c56.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
Diffstat (limited to 'src')
| -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 bf6a6fa02..f0d4cda7c 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java +++ b/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java @@ -276,7 +276,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; |