commit 8c65620d31a95b0e0650aa91637c68ac6328c8f8
author Ruina Liu <ruina.liu@mediatek.com> Mon Sep 18 17:53:31 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Sep 18 17:53:31 2017 +0000
tree a8bc5fcb76f19254963138848d9cf50fb4f2dd68
parent 1157a7196bc2e044c69c1b5172e52b3bf8e9b4da
parent ac421b8f44a2680736f67b997a3111bc2197aa43

Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes"
am: ac421b8f44

Change-Id: I9c6b453e0ef71a70cd972a47763d042943fe3f36

core/java/android/bluetooth/BluetoothUuid.java

diff --git a/core/java/android/bluetooth/BluetoothUuid.java b/core/java/android/bluetooth/BluetoothUuid.java
index 5bfc54d..76cb3f5 100644
--- a/core/java/android/bluetooth/BluetoothUuid.java
+++ b/core/java/android/bluetooth/BluetoothUuid.java
@@ -232,7 +232,7 @@
      */
     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;
     }