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

am: bf66bf30b1 Change-Id: Id5f413c21eb39e540d2417f9c19b7553f57d6b6a
2017-08-31 19:25:33 +00:00
parent 60a0a021d1 bf66bf30b1
commit 4dddaf18e1
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();
        }
    }