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

Merge "Fix NPE in BluetoothPairingController when comparing BluetoothClass" am: 9aa06f28e8 am: ce2edfa3d4 am: 1da99510b1

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

Change-Id: Ib68558e8896e5bd282eacd34f2bc2044bed5f54c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
William Escande
2023-01-05 07:37:29 +00:00
committed by Automerger Merge Worker
parent 0b3f453482 1da99510b1
commit 377d52bfc1
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/bluetooth/BluetoothPairingController.java
View File

@@ -31,6 +31,7 @@ import androidx.annotation.VisibleForTesting;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.bluetooth.BluetoothPairingDialogFragment.BluetoothPairingDialogListener; import com.android.settings.bluetooth.BluetoothPairingDialogFragment.BluetoothPairingDialogListener;
import com.android.settings.core.SettingsUIDeviceConfig; import com.android.settings.core.SettingsUIDeviceConfig;
import com.android.settingslib.bluetooth.BluetoothUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.bluetooth.LocalBluetoothProfile; import com.android.settingslib.bluetooth.LocalBluetoothProfile;
@@ -238,8 +239,8 @@ public class BluetoothPairingController implements OnCheckedChangeListener,
case BluetoothDevice.ACCESS_REJECTED: case BluetoothDevice.ACCESS_REJECTED:
return false; return false;
default: default:
if (mDevice.getBluetoothClass().getDeviceClass() if (BluetoothUtils.isDeviceClassMatched(
== BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) { mDevice, BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE)) {
return BluetoothDevice.EXTRA_PAIRING_INITIATOR_FOREGROUND == mInitiator; return BluetoothDevice.EXTRA_PAIRING_INITIATOR_FOREGROUND == mInitiator;
} }
return false; return false;
@@ -250,11 +251,12 @@ public class BluetoothPairingController implements OnCheckedChangeListener,
* Update Phone book permission * Update Phone book permission
* *
*/ */
public void setContactSharingState() { public void setContactSharingState() {
final int permission = mDevice.getPhonebookAccessPermission(); final int permission = mDevice.getPhonebookAccessPermission();
if (permission == BluetoothDevice.ACCESS_ALLOWED if (permission == BluetoothDevice.ACCESS_ALLOWED
|| (permission == BluetoothDevice.ACCESS_UNKNOWN && mDevice.getBluetoothClass(). || (permission == BluetoothDevice.ACCESS_UNKNOWN
getDeviceClass() == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE)) { && BluetoothUtils.isDeviceClassMatched(mDevice,
BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE))) {
onCheckedChanged(null, true); onCheckedChanged(null, true);
} else { } else {
onCheckedChanged(null, false); onCheckedChanged(null, false);