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

Merge "ForgetDeviceDialogFragment check whether device is null or not" into udc-d1-dev am: 4929da451c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23578859

Change-Id: Ibff4ceef103e798e1e27ee413009ccac92a79cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
SongFerng Wang
2023-06-07 02:09:50 +00:00
committed by Automerger Merge Worker
parent 4eceb6c5c5 4929da451c
commit 8b1bfeef73
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java
View File

@@ -23,6 +23,7 @@ import android.bluetooth.BluetoothDevice;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
@@ -63,6 +64,13 @@ public class ForgetDeviceDialogFragment extends InstrumentedDialogFragment {
@Override @Override
public Dialog onCreateDialog(Bundle inState) { 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) -> { DialogInterface.OnClickListener onConfirm = (dialog, which) -> {
mDevice.unpair(); mDevice.unpair();
Activity activity = getActivity(); Activity activity = getActivity();
@@ -70,9 +78,6 @@ public class ForgetDeviceDialogFragment extends InstrumentedDialogFragment {
activity.finish(); activity.finish();
} }
}; };
Context context = getContext();
mDevice = getDevice(context);
AlertDialog dialog = new AlertDialog.Builder(context) AlertDialog dialog = new AlertDialog.Builder(context)
.setPositiveButton(R.string.bluetooth_unpair_dialog_forget_confirm_button, .setPositiveButton(R.string.bluetooth_unpair_dialog_forget_confirm_button,
onConfirm) onConfirm)