diff options
| author | Matthew Xie <mattx@google.com> | 2014-10-23 12:53:40 -0700 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2015-04-10 16:10:22 -0700 |
| commit | 0454165bc6bb2546a0cd64ebd60bb5a317f310f6 (patch) | |
| tree | 42ad5f7d0a7cb13cc7290fbe9c96eeb231c5d2e5 | |
| parent | 2546cc33eb8892e7279413d4a4b90850512bd5f8 (diff) | |
| download | android_packages_apps_Bluetooth-0454165bc6bb2546a0cd64ebd60bb5a317f310f6.tar.gz android_packages_apps_Bluetooth-0454165bc6bb2546a0cd64ebd60bb5a317f310f6.tar.bz2 android_packages_apps_Bluetooth-0454165bc6bb2546a0cd64ebd60bb5a317f310f6.zip | |
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
bug 17770561
Change-Id: I34fb018d9787b4deef8592c71f5539778e76e325
| -rw-r--r-- | 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 f38736513..2cffb48a0 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppService.java +++ b/src/com/android/bluetooth/opp/BluetoothOppService.java @@ -806,7 +806,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 = newConfirm; |