diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-05 01:10:13 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-05 01:10:13 -0800 |
| commit | a5e54322e140584d924b1e4ae96418f0b4ac4254 (patch) | |
| tree | 881b70b74e4877c6deb7c53e26b04e3c3af0a883 | |
| parent | d9daafe18844b05a934b593021882b07a829ebda (diff) | |
| parent | 6e0b6a99ebb0e2392654570ab5426de9e15dbc0e (diff) | |
| download | android_packages_apps_Bluetooth-a5e54322e140584d924b1e4ae96418f0b4ac4254.tar.gz android_packages_apps_Bluetooth-a5e54322e140584d924b1e4ae96418f0b4ac4254.tar.bz2 android_packages_apps_Bluetooth-a5e54322e140584d924b1e4ae96418f0b4ac4254.zip | |
Merge "updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it"
| -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 7306f9ca0..6f88d7362 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppService.java +++ b/src/com/android/bluetooth/opp/BluetoothOppService.java @@ -840,7 +840,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; |