diff options
| author | Matthew Xie <mattx@google.com> | 2014-10-23 12:53:40 -0700 |
|---|---|---|
| committer | Josh Armour <jarmour@google.com> | 2014-11-05 22:22:10 +0000 |
| commit | 964a72ae9eebe882aebcab4b5326afb6cc06f595 (patch) | |
| tree | 2d19406fa031cbc7eab6bae940c1c957536db13e /src | |
| parent | 7677468ea5a2a71780e8bcf69a97c939b2ebc39b (diff) | |
| download | android_packages_apps_Bluetooth-964a72ae9eebe882aebcab4b5326afb6cc06f595.tar.gz android_packages_apps_Bluetooth-964a72ae9eebe882aebcab4b5326afb6cc06f595.tar.bz2 android_packages_apps_Bluetooth-964a72ae9eebe882aebcab4b5326afb6cc06f595.zip | |
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
bug 17770561
Change-Id: I34fb018d9787b4deef8592c71f5539778e76e325
(cherry picked from commit 70743aa46fa95bd252acea614bfde8cc65e03890)
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/bluetooth/opp/BluetoothOppService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppService.java b/src/com/android/bluetooth/opp/BluetoothOppService.java index 421ad2efb..93f100457 100755 --- a/src/com/android/bluetooth/opp/BluetoothOppService.java +++ b/src/com/android/bluetooth/opp/BluetoothOppService.java @@ -702,7 +702,9 @@ public class BluetoothOppService extends Service { info.mVisibility = newVisibility; if (info.mConfirm == BluetoothShare.USER_CONFIRMATION_PENDING - && newConfirm != BluetoothShare.USER_CONFIRMATION_PENDING) { + && (newConfirm == BluetoothShare.USER_CONFIRMATION_CONFIRMED || + newConfirm == BluetoothShare.USER_CONFIRMATION_AUTO_CONFIRMED || + newConfirm == BluetoothShare.USER_CONFIRMATION_HANDOVER_CONFIRMED)) { confirmed = true; } info.mConfirm = cursor.getInt(cursor |