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

Commit 4b630060 authored by zhangbin.yin's avatar zhangbin.yin Committed by android-build-merger
Browse files

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

am: b1de0939

Change-Id: Idb6623f977814a95833224143734f515860604bb
parents 08372761 b1de0939

android/app/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);

            }

android/app/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();