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

Commit 09213198 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"... 

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

Change-Id: I249a0a3fc1a8c030041cfca8b3dbd49bc2badf07
parents c0f77c7e 4dddaf18

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

        }

    }