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

Commit 1b564905 authored by Chienyuan Huang's avatar Chienyuan Huang Committed by Automerger Merge Worker
Browse files

Merge "Update TYPE_ADVERTISING_DATA_TYPE to 8" into tm-qpr-dev am: b5b9a4c5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21533465



Change-Id: Ice28dd846987ebbcf9cb0134a5995d11cb20a31d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5fcde54a b5b9a4c5

android/app/src/com/android/bluetooth/gatt/ScanFilterQueue.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import java.util.UUID; 
    public static final int TYPE_LOCAL_NAME = 4;

    public static final int TYPE_MANUFACTURER_DATA = 5;

    public static final int TYPE_SERVICE_DATA = 6;

    public static final int TYPE_ADVERTISING_DATA_TYPE = 7;

    public static final int TYPE_ADVERTISING_DATA_TYPE = 8;



    // Max length is 31 - 3(flags) - 2 (one byte for length and one byte for type).

    private static final int MAX_LEN_PER_FIELD = 26;