diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-12-03 23:03:22 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-12-03 23:03:22 -0800 |
| commit | ed5ce0529180d5b42e90a45c3bc9fb4809fcfbb6 (patch) | |
| tree | 69a7a8acb08930cb4d159c17ad153f98fab64c2d | |
| parent | a04b0ed57e9019606864a2c26393313b28578bc7 (diff) | |
| parent | 9acf0403cf8041e0943fd306d6affc242de2f10b (diff) | |
| download | android_packages_apps_Bluetooth-ed5ce0529180d5b42e90a45c3bc9fb4809fcfbb6.tar.gz android_packages_apps_Bluetooth-ed5ce0529180d5b42e90a45c3bc9fb4809fcfbb6.tar.bz2 android_packages_apps_Bluetooth-ed5ce0529180d5b42e90a45c3bc9fb4809fcfbb6.zip | |
Merge "Bluetooth-OPP: Send the share status of file once transfer is complete"
| -rw-r--r-- | src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java | 1 | ||||
| -rw-r--r-- | src/com/android/bluetooth/opp/BluetoothOppService.java | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java b/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java index 159bb097e..6684b1fd7 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java +++ b/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java @@ -365,6 +365,7 @@ public class BluetoothOppObexClientSession implements BluetoothOppObexSession { if (status == BluetoothShare.STATUS_SUCCESS) { Message msg = Message.obtain(mCallback); msg.what = BluetoothOppObexSession.MSG_SHARE_COMPLETE; + mInfo.mStatus = status; msg.obj = mInfo; msg.sendToTarget(); } else { diff --git a/src/com/android/bluetooth/opp/BluetoothOppService.java b/src/com/android/bluetooth/opp/BluetoothOppService.java index 5d1846f62..3e67f8f97 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppService.java +++ b/src/com/android/bluetooth/opp/BluetoothOppService.java @@ -827,8 +827,7 @@ public class BluetoothOppService extends Service { info.mConfirm = newConfirm; int newStatus = cursor.getInt(statusColumn); int oldStatus = info.mStatus; - if (!BluetoothShare.isStatusCompleted(info.mStatus) - && BluetoothShare.isStatusCompleted(newStatus)) { + if (BluetoothShare.isStatusCompleted(info.mStatus)) { mNotifier.mNotificationMgr.cancel(info.mId); } |