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

am: 4dddaf18e1 Change-Id: I249a0a3fc1a8c030041cfca8b3dbd49bc2badf07
2017-08-31 19:54:20 +00:00
parent c0f77c7e6f 4dddaf18e1
commit 0921319824
1 changed files with 0 additions and 6 deletions
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -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();
        }
    }