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 | fb48af27ad142cd5427bb6f11f7fb76474221490 (patch) | |
| tree | f9fecb9c3fa21fac785de6c015eb5ee39c9c9700 /framework/java/android/bluetooth/BluetoothClass.java | |
| parent | 8a92b2c740be8f946bbab7459d809c6ba3cd3048 (diff) | |
| parent | 11a22bdca27e4545c0c4fbac0d5f03c0b19d0575 (diff) | |
Merge "BluetoothClass: Use mask to get MajorDeviceClass" am: a9f7570de6 am: c894726379 am: 11a22bdca2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1516221
Change-Id: If4788ee4e28ee9a7dc571eea1ca15f751e2611ef
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothClass.java')
| -rwxr-xr-x | framework/java/android/bluetooth/BluetoothClass.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/BluetoothClass.java b/framework/java/android/bluetooth/BluetoothClass.java index 603a7ff29e..7fe18a0704 100755 --- a/framework/java/android/bluetooth/BluetoothClass.java +++ b/framework/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; } |