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

Commit bf66bf30 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev

parents 8d9e305d 6108d6c2

src/com/android/settings/bluetooth/BluetoothPairingDialog.java

+0 −6
Original line number Diff line number Diff line
@@ -108,12 +108,6 @@ public class BluetoothPairingDialog extends Activity { 
    @VisibleForTesting

    void dismiss() {

        if (!isFinishing()) {

            BluetoothPairingDialogFragment bluetoothFragment =

                (BluetoothPairingDialogFragment) getFragmentManager()

                    .findFragmentByTag(FRAGMENT_TAG);

            if (bluetoothFragment != null) {

                bluetoothFragment.dismiss();

            }

            finish();

        }

    }