Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63397ede authored by Martijn Coenen's avatar Martijn Coenen Committed by Android Git Automerger
Browse files

am 3cb57672: Merge "Don\'t MediaScan files received through handover." into jb-dev 

* commit '3cb57672':
  Don't MediaScan files received through handover.
parents 20e0594a 3cb57672

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

+2 −1
Original line number Diff line number Diff line
@@ -865,7 +865,8 @@ public class BluetoothOppService extends Service { 
    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.