From 964a72ae9eebe882aebcab4b5326afb6cc06f595 Mon Sep 17 00:00:00 2001 From: Matthew Xie Date: Thu, 23 Oct 2014 12:53:40 -0700 Subject: updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it bug 17770561 Change-Id: I34fb018d9787b4deef8592c71f5539778e76e325 (cherry picked from commit 70743aa46fa95bd252acea614bfde8cc65e03890) --- src/com/android/bluetooth/opp/BluetoothOppService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') 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 -- cgit v1.2.3