From 13cd0526934779489bdd79f83d42bc921fb3dd06 Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Tue, 6 Jun 2023 14:08:44 +0800 Subject: [PATCH] ForgetDeviceDialogFragment check whether device is null or not Bug: 280687867 Test: build pass Change-Id: I4134569854165f20f6287406d9ed627b2c15c05b --- .../bluetooth/ForgetDeviceDialogFragment.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java b/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java index 1da8672b760..60d63c637df 100644 --- a/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java +++ b/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java @@ -23,6 +23,7 @@ import android.bluetooth.BluetoothDevice; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; +import android.util.Log; import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; @@ -63,6 +64,13 @@ public class ForgetDeviceDialogFragment extends InstrumentedDialogFragment { @Override public Dialog onCreateDialog(Bundle inState) { + Context context = getContext(); + mDevice = getDevice(context); + if (mDevice == null) { + Log.e(TAG, "onCreateDialog: Device is null."); + return null; + } + DialogInterface.OnClickListener onConfirm = (dialog, which) -> { mDevice.unpair(); Activity activity = getActivity(); @@ -70,9 +78,6 @@ public class ForgetDeviceDialogFragment extends InstrumentedDialogFragment { activity.finish(); } }; - Context context = getContext(); - mDevice = getDevice(context); - AlertDialog dialog = new AlertDialog.Builder(context) .setPositiveButton(R.string.bluetooth_unpair_dialog_forget_confirm_button, onConfirm)