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

Commit 3620bb5d authored by yamei du's avatar yamei du Committed by Hyundo Moon
Browse files

OPP: Delete incomplete download file 

Disabling Bluetooth during file reception via OPP will cause the file
reception to fail. However, since the receiving process only
terminates after the session is stopped, the incomplete receiving
file is not deleted because mCallback has been cleared when the
session stops.

Bug: 331297926
Bug: 331298337
Test: m com.android.btservices
Test: Manual. Disable Bluetooth during file reception via OPP.
      There should be no incomplete file in Downloads directory.
Change-Id: I66945254c6064958f4a71a28f22ae2d8cebf0deb
parent f8102f40

android/app/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java

+13 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import com.android.bluetooth.BluetoothStatsLog; 
import com.android.bluetooth.Utils;

import com.android.bluetooth.btservice.MetricsLogger;

import com.android.bluetooth.content_profiles.ContentProfileErrorReportUtils;

import com.android.bluetooth.flags.Flags;

import com.android.obex.HeaderSet;

import com.android.obex.ObexTransport;

import com.android.obex.Operation;
@@ -426,6 +427,18 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler 
                    msg.obj = mInfo;

                    msg.sendToTarget();

                }



                if (Flags.oppRemoveIncompleteDownload() && mFileInfo.mInsertUri != null) {

                    Log.d(

                        TAG,

                        "Download failed. Removing the file. Uri=" + mFileInfo.mInsertUri);

                    BluetoothMethodProxy.getInstance()

                            .contentResolverDelete(

                                    mContext.getContentResolver(),

                                    mFileInfo.mInsertUri,

                                    null,

                                    null);

                }

            }

        } else if (mAccepted == BluetoothShare.USER_CONFIRMATION_DENIED

                || mAccepted == BluetoothShare.USER_CONFIRMATION_TIMEOUT) {