diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-03 21:23:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-03 21:23:48 +0000 |
| commit | 9644c55402bf3587d91fbbcd60b01c143a671103 (patch) | |
| tree | e6deefe16ffcd2411bbe4b98660d477b4117b1c0 /core/java/android/bluetooth/BluetoothClass.java | |
| parent | 0433f42f75495cefba0956928f9bbf3229addb6d (diff) | |
| parent | e1271704a99c3152571784fc9350d8ffe992a7f8 (diff) | |
Merge "BluetoothClass: Use mask to get MajorDeviceClass" am: a9f7570de6 am: 9fa0668d29 am: e1271704a9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1516221
Change-Id: If4788ee4e28ee9a7dc571eea1ca15f751e2611ef
Diffstat (limited to 'core/java/android/bluetooth/BluetoothClass.java')
| -rwxr-xr-x | core/java/android/bluetooth/BluetoothClass.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothClass.java b/core/java/android/bluetooth/BluetoothClass.java index 603a7ff29ea3..7fe18a0704ba 100755 --- a/core/java/android/bluetooth/BluetoothClass.java +++ b/core/java/android/bluetooth/BluetoothClass.java @@ -426,13 +426,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; } |