commit a9f7570de6fb8d87da260e4255f13eda91e4aba9
author Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 03 19:00:23 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 03 19:00:23 2020 +0000
tree 356d2c6c286e071fd549a8be423cd6bdf3c854a2
parent b8fca94cfe6b018e1b16403695e2f34dec4f4e2e
parent 89bf39528f9bf9eba93a654e76b5f48f4331a144

Merge "BluetoothClass: Use mask to get MajorDeviceClass"

core/java/android/bluetooth/BluetoothClass.java

diff --git a/core/java/android/bluetooth/BluetoothClass.java b/core/java/android/bluetooth/BluetoothClass.java
index 905b0cee..1e92fc0 100755
--- a/core/java/android/bluetooth/BluetoothClass.java
+++ b/core/java/android/bluetooth/BluetoothClass.java
@@ -425,13 +425,13 @@
                     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;
         }