diff options
| author | Matthew Xie <mattx@google.com> | 2014-10-29 17:36:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-29 17:36:54 +0000 |
| commit | 4e6ac48c933b3ac8666fbc2dc1d3021689847067 (patch) | |
| tree | d0dbe2346ae7a8aca8eef104ba8d3cfb6d8e1a09 /src | |
| parent | 9b95221e5d4efc1678f3342a15c05f293cc79a05 (diff) | |
| parent | 70743aa46fa95bd252acea614bfde8cc65e03890 (diff) | |
| download | android_packages_apps_Bluetooth-4e6ac48c933b3ac8666fbc2dc1d3021689847067.tar.gz android_packages_apps_Bluetooth-4e6ac48c933b3ac8666fbc2dc1d3021689847067.tar.bz2 android_packages_apps_Bluetooth-4e6ac48c933b3ac8666fbc2dc1d3021689847067.zip | |
Merge "updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it" into lmp-mr1-dev
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 4d71584d6..9b8a5f4c8 100755 --- a/src/com/android/bluetooth/opp/BluetoothOppService.java +++ b/src/com/android/bluetooth/opp/BluetoothOppService.java @@ -717,7 +717,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 |