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

[LE Broadcast] Fix crash when scan QR code am: c91d017080

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

Change-Id: I0ca420666067575ff0e970a0ec255b024e7ed8e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chaohui Wang
2023-06-19 07:01:37 +00:00
committed by Automerger Merge Worker
parent 7c55f015d7 c91d017080
commit fd264a7696
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/bluetooth/QrCodeScanModeActivity.java
View File

@@ -98,7 +98,7 @@ public class QrCodeScanModeActivity extends QrCodeScanModeBaseActivity {
BluetoothBroadcastUtils.TAG_FRAGMENT_QR_CODE_SCANNER); BluetoothBroadcastUtils.TAG_FRAGMENT_QR_CODE_SCANNER);
if (fragment == null) { if (fragment == null) {
fragment = new QrCodeScanModeFragment(mIsGroupOp, mSink); fragment = new QrCodeScanModeFragment();
} else { } else {
if (fragment.isVisible()) { if (fragment.isVisible()) {
return; return;

8
src/com/android/settings/bluetooth/QrCodeScanModeFragment.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.bluetooth;
import android.app.Activity; import android.app.Activity;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothDevice;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Matrix; import android.graphics.Matrix;
@@ -71,9 +70,7 @@ public class QrCodeScanModeFragment extends InstrumentedFragment implements
public static final String KEY_BROADCAST_METADATA = "key_broadcast_metadata"; public static final String KEY_BROADCAST_METADATA = "key_broadcast_metadata";
private boolean mIsGroupOp;
private int mCornerRadius; private int mCornerRadius;
private BluetoothDevice mSink;
private String mBroadcastMetadata; private String mBroadcastMetadata;
private Context mContext; private Context mContext;
private QrCamera mCamera; private QrCamera mCamera;
@@ -81,11 +78,6 @@ public class QrCodeScanModeFragment extends InstrumentedFragment implements
private TextView mSummary; private TextView mSummary;
private TextView mErrorMessage; private TextView mErrorMessage;
public QrCodeScanModeFragment(boolean isGroupOp, BluetoothDevice sink) {
mIsGroupOp = isGroupOp;
mSink = sink;
}
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);