PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: bf66bf30b1

Change-Id: Id5f413c21eb39e540d2417f9c19b7553f57d6b6a
This commit is contained in:
Jack He
2017-08-31 19:25:33 +00:00
committed by android-build-merger
parent 60a0a021d1 bf66bf30b1
commit 4dddaf18e1
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/bluetooth/BluetoothPairingDialog.java
View File

@@ -108,12 +108,6 @@ public class BluetoothPairingDialog extends Activity {
@VisibleForTesting @VisibleForTesting
void dismiss() { void dismiss() {
if (!isFinishing()) { if (!isFinishing()) {
BluetoothPairingDialogFragment bluetoothFragment =
(BluetoothPairingDialogFragment) getFragmentManager()
.findFragmentByTag(FRAGMENT_TAG);
if (bluetoothFragment != null) {
bluetoothFragment.dismiss();
}
finish(); finish();
} }
} }