| commit | 4dddaf18e17e52e4fe500539f8cb7b8d03d970f8 | [log] [tgz] |
|---|---|---|
| author | Jack He <siyuanh@google.com> | Thu Aug 31 19:25:33 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 31 19:25:33 2017 +0000 |
| tree | 45732117f9d1482486a0a5233bdea3c49f02d2ba | |
| parent | 60a0a021d1eb5853221d0604e946c1c3dcb1542d [diff] | |
| parent | bf66bf30b16248fa30f523f69dcd53118a2084ee [diff] |
Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev am: bf66bf30b1 Change-Id: Id5f413c21eb39e540d2417f9c19b7553f57d6b6a
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java index 97382c3..22cb3a6 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -108,12 +108,6 @@ @VisibleForTesting void dismiss() { if (!isFinishing()) { - BluetoothPairingDialogFragment bluetoothFragment = - (BluetoothPairingDialogFragment) getFragmentManager() - .findFragmentByTag(FRAGMENT_TAG); - if (bluetoothFragment != null) { - bluetoothFragment.dismiss(); - } finish(); } }