From c91d017080503593033b2fe90cc54b384ef299fb Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Sat, 17 Jun 2023 00:07:16 +0800 Subject: [PATCH] [LE Broadcast] Fix crash when scan QR code Crash happens when rotated screen. QrCodeScanModeFragment should only have default constructor. Remove unused params to fix. To start this page, adb shell am start \ -a android.settings.BLUETOOTH_LE_AUDIO_QR_CODE_SCANNER Fix: 287363885 Test: Manually Change-Id: I3c4bcfdb8ae6ddf750e16d8e7565cb9d45d11788 --- .../settings/bluetooth/QrCodeScanModeActivity.java | 2 +- .../settings/bluetooth/QrCodeScanModeFragment.java | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/com/android/settings/bluetooth/QrCodeScanModeActivity.java b/src/com/android/settings/bluetooth/QrCodeScanModeActivity.java index 92786c9b813..a0b249dee87 100644 --- a/src/com/android/settings/bluetooth/QrCodeScanModeActivity.java +++ b/src/com/android/settings/bluetooth/QrCodeScanModeActivity.java @@ -98,7 +98,7 @@ public class QrCodeScanModeActivity extends QrCodeScanModeBaseActivity { BluetoothBroadcastUtils.TAG_FRAGMENT_QR_CODE_SCANNER); if (fragment == null) { - fragment = new QrCodeScanModeFragment(mIsGroupOp, mSink); + fragment = new QrCodeScanModeFragment(); } else { if (fragment.isVisible()) { return; diff --git a/src/com/android/settings/bluetooth/QrCodeScanModeFragment.java b/src/com/android/settings/bluetooth/QrCodeScanModeFragment.java index f89dac6f935..80aedd7142a 100644 --- a/src/com/android/settings/bluetooth/QrCodeScanModeFragment.java +++ b/src/com/android/settings/bluetooth/QrCodeScanModeFragment.java @@ -18,7 +18,6 @@ package com.android.settings.bluetooth; import android.app.Activity; import android.app.settings.SettingsEnums; -import android.bluetooth.BluetoothDevice; import android.content.Context; import android.content.Intent; import android.graphics.Matrix; @@ -71,9 +70,7 @@ public class QrCodeScanModeFragment extends InstrumentedFragment implements public static final String KEY_BROADCAST_METADATA = "key_broadcast_metadata"; - private boolean mIsGroupOp; private int mCornerRadius; - private BluetoothDevice mSink; private String mBroadcastMetadata; private Context mContext; private QrCamera mCamera; @@ -81,11 +78,6 @@ public class QrCodeScanModeFragment extends InstrumentedFragment implements private TextView mSummary; private TextView mErrorMessage; - public QrCodeScanModeFragment(boolean isGroupOp, BluetoothDevice sink) { - mIsGroupOp = isGroupOp; - mSink = sink; - } - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState);