summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2017-09-18 17:37:26 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-09-18 17:37:26 +0000
commitac421b8f44a2680736f67b997a3111bc2197aa43 (patch)
tree540ee69b7bdd9ab2ce215b1536eba174a1f3093e
parentfab8162abd97c7739fdef7de43328e83fcaec0be (diff)
parent044e0fe5c5de11c02725428fd09302216184537f (diff)
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes"
-rw-r--r--core/java/android/bluetooth/BluetoothUuid.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothUuid.java b/core/java/android/bluetooth/BluetoothUuid.java
index 5bfc54d267ca..76cb3f5b548e 100644
--- a/core/java/android/bluetooth/BluetoothUuid.java
+++ b/core/java/android/bluetooth/BluetoothUuid.java
@@ -232,7 +232,7 @@ public final class BluetoothUuid {
*/
public static int getServiceIdentifierFromParcelUuid(ParcelUuid parcelUuid) {
UUID uuid = parcelUuid.getUuid();
- long value = (uuid.getMostSignificantBits() & 0x0000FFFF00000000L) >>> 32;
+ long value = (uuid.getMostSignificantBits() & 0xFFFFFFFF00000000L) >>> 32;
return (int) value;
}