diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2014-12-14 12:22:31 -0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2015-03-18 21:42:29 +0000 |
| commit | c0b0abcd183c0912f900453f4fe3302f42800a59 (patch) | |
| tree | cd4b95f680e6db70203d98091ac9c543d49e4833 | |
| parent | 842e3fe083c3e6a244c40697c87654abfec6b531 (diff) | |
| download | android_packages_apps_Bluetooth-stable/cm-12.0-YNG1TA.tar.gz android_packages_apps_Bluetooth-stable/cm-12.0-YNG1TA.tar.bz2 android_packages_apps_Bluetooth-stable/cm-12.0-YNG1TA.zip | |
Prevent duplicate OPP permission request dialogsstable/cm-12.0-YNG1TA
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
(cherry picked from commit c905e5a564a1f055f655724e2efb2765c2c098e3)
| -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 2d86c9606..e62e9d567 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java +++ b/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java @@ -416,7 +416,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; |