diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-05 19:40:18 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-05 19:40:18 -0800 |
| commit | d31e109f8a2b2d58c0a26a8eee6cb23183f7509d (patch) | |
| tree | fb4bd1a17ecdc9fc84ceed752a195415a77af2b0 | |
| parent | 2fbd4fe394d172e15aad06dfb5f6d977102c1f0a (diff) | |
| parent | e880022abeb16a0576495b6d5e0433de40573269 (diff) | |
| download | android_packages_apps_Bluetooth-d31e109f8a2b2d58c0a26a8eee6cb23183f7509d.tar.gz android_packages_apps_Bluetooth-d31e109f8a2b2d58c0a26a8eee6cb23183f7509d.tar.bz2 android_packages_apps_Bluetooth-d31e109f8a2b2d58c0a26a8eee6cb23183f7509d.zip | |
Merge "Prevent duplicate OPP permission request dialogs"
| -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; |