diff options
| author | Matthew Xie <mattx@google.com> | 2014-10-23 12:53:40 -0700 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2015-03-18 20:41:36 +0000 |
| commit | caf1ca1c169eecafc9ff51d490350a7dad96ec8b (patch) | |
| tree | c68ea0e6c746182fff0a1950bba9a711cd415798 | |
| parent | 4e9c26318b5865f1945c8a345b130c0a3a446c5e (diff) | |
| download | android_packages_apps_Bluetooth-caf1ca1c169eecafc9ff51d490350a7dad96ec8b.tar.gz android_packages_apps_Bluetooth-caf1ca1c169eecafc9ff51d490350a7dad96ec8b.tar.bz2 android_packages_apps_Bluetooth-caf1ca1c169eecafc9ff51d490350a7dad96ec8b.zip | |
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
bug 17770561
Change-Id: I34fb018d9787b4deef8592c71f5539778e76e325
(cherry picked from commit 70743aa46fa95bd252acea614bfde8cc65e03890)
(cherry picked from commit 57262f776b6b7bf3453d96c4b7b555bfc3fb45a0)
| -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 c6fb79ad2..ab85f9739 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppService.java +++ b/src/com/android/bluetooth/opp/BluetoothOppService.java @@ -834,7 +834,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; |