Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bff59e2 authored by Ruina Liu's avatar Ruina Liu Committed by Ting Zheng
Browse files

Fix extracting 32-bit uuid error via calling method uuidToBytes 

A new defined method of uuidToBytes is used to convert
Bluetooth uuid to bytes in the case of BLE advertising.
But the most significant 16 bits of a 32-bit uuid
will be cleared after the and operations with
0X0000FFFF00000000L in the function of
getServiceIdentifierFromParcelUuid.
0XFFFFFFFF00000000L should be used as bit mask.

Change-Id: I83e22ffbecd718540e644289fee12bf9c3b66305
Test: Advertise with payload contains 32-bit uuid
parent 6209c205

framework/java/android/bluetooth/BluetoothUuid.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }