diff options
| author | Ruina Liu <ruina.liu@mediatek.com> | 2017-09-18 17:53:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-18 17:53:31 +0000 |
| commit | 8c65620d31a95b0e0650aa91637c68ac6328c8f8 (patch) | |
| tree | a8bc5fcb76f19254963138848d9cf50fb4f2dd68 /core/java/android | |
| parent | 1157a7196bc2e044c69c1b5172e52b3bf8e9b4da (diff) | |
| parent | ac421b8f44a2680736f67b997a3111bc2197aa43 (diff) | |
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes"
am: ac421b8f44
Change-Id: I9c6b453e0ef71a70cd972a47763d042943fe3f36
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothUuid.java | 2 |
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; } |