commit 3cb57672cefbe78bf89590fb3053b4ab4ecd461b
author Martijn Coenen <maco@google.com> Wed May 16 15:51:34 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 16 15:51:34 2012 -0700
tree c7f934cfeb01deaa1f03a6686010b08a45fe4cb4
parent 3236357a784d1bfb6c717115b10a227c98de2a97
parent d5e1472188b7e21123a02339ed8766256aa8f630

Merge "Don't MediaScan files received through handover." into jb-dev

src/com/android/bluetooth/opp/BluetoothOppService.java

diff --git a/src/com/android/bluetooth/opp/BluetoothOppService.java b/src/com/android/bluetooth/opp/BluetoothOppService.java
index 4f68741..c348e33 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppService.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppService.java
@@ -865,7 +865,8 @@
     private boolean shouldScanFile(int arrayPos) {
         BluetoothOppShareInfo info = mShares.get(arrayPos);
         return BluetoothShare.isStatusSuccess(info.mStatus)
-                && info.mDirection == BluetoothShare.DIRECTION_INBOUND && !info.mMediaScanned;
+                && info.mDirection == BluetoothShare.DIRECTION_INBOUND && !info.mMediaScanned &&
+                info.mConfirm != BluetoothShare.USER_CONFIRMATION_HANDOVER_CONFIRMED;
     }
 
     // Run in a background thread at boot.