diff options
author | Matthew Xie <mattx@google.com> | 2014-11-17 09:50:54 -0800 |
---|---|---|
committer | Matthew Xie <mattx@google.com> | 2014-11-17 09:50:54 -0800 |
commit | e93cc4d347fd5d263d7740ad85f7f99b64651126 (patch) | |
tree | 76de9c844f631dcaba507394dfbf7e7b30a0b2f9 /src/com/android/bluetooth/opp/BluetoothOppTransfer.java | |
parent | cf496e4230a5067a19e067115502b3961c9bf220 (diff) | |
download | android_packages_apps_Bluetooth-e93cc4d347fd5d263d7740ad85f7f99b64651126.tar.gz android_packages_apps_Bluetooth-e93cc4d347fd5d263d7740ad85f7f99b64651126.tar.bz2 android_packages_apps_Bluetooth-e93cc4d347fd5d263d7740ad85f7f99b64651126.zip |
Check previous user confirmation before auto-confirm put request
Also correct a confirm status change check in updateShare.
Bug: 17770561, 18343032
Change-Id: I8e7d10e73604c0bf1c88801a1caef7d579fbd1eb
Diffstat (limited to 'src/com/android/bluetooth/opp/BluetoothOppTransfer.java')
-rwxr-xr-x | src/com/android/bluetooth/opp/BluetoothOppTransfer.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppTransfer.java b/src/com/android/bluetooth/opp/BluetoothOppTransfer.java index 2dbed4992..6c883d2ae 100755 --- a/src/com/android/bluetooth/opp/BluetoothOppTransfer.java +++ b/src/com/android/bluetooth/opp/BluetoothOppTransfer.java @@ -462,7 +462,7 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch if (V) Log.v(TAG, "processCurrentShare" + mCurrentShare.mId); mSession.addShare(mCurrentShare); if (mCurrentShare.mConfirm == BluetoothShare.USER_CONFIRMATION_HANDOVER_CONFIRMED) { - setConfirmed(); + confirmStatusChanged(); } } @@ -470,7 +470,7 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch * Set transfer confirmed status. It should only be called for inbound * transfer */ - public void setConfirmed() { + public void confirmStatusChanged() { /* unblock server session */ final Thread notifyThread = new Thread("Server Unblock thread") { public void run() { @@ -480,7 +480,7 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch } } }; - if (V) Log.v(TAG, "setConfirmed to unblock mSession" + mSession.toString()); + if (V) Log.v(TAG, "confirmStatusChanged to unblock mSession" + mSession.toString()); notifyThread.start(); } @@ -711,7 +711,7 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch if (V) Log.v(TAG, "Transfer continue session for info " + mCurrentShare.mId + " from batch " + mBatch.mId); processCurrentShare(); - setConfirmed(); + confirmStatusChanged(); } } } |