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

Commit 568abb40 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix multiple instances of BT file transfer ongoing dialog"

parents 0f00b473 3946690c

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

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ public class BluetoothOppReceiver extends BroadcastReceiver { 
                BluetoothOppUtility.updateVisibilityToHidden(context, uri);

            } else {

                Intent in = new Intent(context, BluetoothOppTransferActivity.class);

                in.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

                in.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);

                in.setDataAndNormalize(uri);

                context.startActivity(in);

            }

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

+4 −0
Original line number Diff line number Diff line
@@ -464,6 +464,10 @@ public class BluetoothOppTransferActivity extends AlertActivity 
        // DIALOG_SEND_COMPLETE_SUCCESS/DIALOG_SEND_COMPLETE_FAIL

        if (!mIsComplete && BluetoothShare.isStatusCompleted(mTransInfo.mStatus)

                && mNeedUpdateButton) {

            if (mObserver != null) {

                getContentResolver().unregisterContentObserver(mObserver);

                mObserver = null;

            }

            displayWhichDialog();

            updateButton();

            customizeViewContent();