Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "BluetoothClass: Use mask to get MajorDeviceClass" am: a9f7570de6 am: 9fa0668d29

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1516221

Change-Id: I9b320189fa9bcfac4f23e2bda4452c399cf75f9d
This commit is contained in:
Treehugger Robot
2020-12-03 20:23:51 +00:00
committed by Automerger Merge Worker
parent f7bf6a7b82 9fa0668d29
commit e1271704a9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/bluetooth/BluetoothClass.java
View File

@@ -425,13 +425,13 @@ public final class BluetoothClass implements Parcelable {
return false;
}
} else if (profile == PROFILE_HID) {
return (getDeviceClass() & Device.Major.PERIPHERAL) == Device.Major.PERIPHERAL;
return getMajorDeviceClass() == Device.Major.PERIPHERAL;
} else if (profile == PROFILE_PANU || profile == PROFILE_NAP) {
// No good way to distinguish between the two, based on class bits.
if (hasService(Service.NETWORKING)) {
return true;
}
return (getDeviceClass() & Device.Major.NETWORKING) == Device.Major.NETWORKING;
return getMajorDeviceClass() == Device.Major.NETWORKING;
} else {
return false;
}