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

Commit 4dddaf18 authored by Jack He's avatar Jack He Committed by android-build-merger
Browse files

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

am: bf66bf30

Change-Id: Id5f413c21eb39e540d2417f9c19b7553f57d6b6a
parents 60a0a021 bf66bf30

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();

        }

    }