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

Commit bc0a2541 authored by Madhava Srinivasan's avatar Madhava Srinivasan Committed by Robin Lee
Browse files

Restricting AndroidTV Remote Service UUIDs' access 

This CL elevates the permission required for accessing Android TV
Remotes voice over BLE service UUIDs as the service (its associated
characteristics) controls the remote mic and carry raw audio data.

Bug: 121175449
Test: Manual. Tested with and without this change to register for
characteristic change updates.
Test: //experimental/users/madhavags/java/com/google/madhavags/ble

Change-Id: Ie70aa1b0be863df206705751016268bbc9f97c3c
parent 817597bc

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

+8 −1
Original line number Diff line number Diff line
@@ -105,6 +105,9 @@ public class GattService extends ProfileService { 
            UUID.fromString("00002A4D-0000-1000-8000-00805F9B34FB")

    };



    private static final UUID ANDROID_TV_REMOTE_SERVICE_UUID =

            UUID.fromString("AB5E0001-5A21-4F05-BC7D-AF01F617B664");



    private static final UUID[] FIDO_UUIDS = {

            UUID.fromString("0000FFFD-0000-1000-8000-00805F9B34FB") // U2F

    };
@@ -2969,7 +2972,7 @@ public class GattService extends ProfileService { 
    }



    private boolean isRestrictedSrvcUuid(final UUID srvcUuid) {

        return isFidoUUID(srvcUuid);

        return isFidoUUID(srvcUuid) || isAndroidTvRemoteSrvcUUID(srvcUuid);

    }



    private boolean isHidUuid(final UUID uuid) {
@@ -2981,6 +2984,10 @@ public class GattService extends ProfileService { 
        return false;

    }



    private boolean isAndroidTvRemoteSrvcUUID(final UUID uuid) {

        return ANDROID_TV_REMOTE_SERVICE_UUID.equals(uuid);

    }



    private boolean isFidoUUID(final UUID uuid) {

        for (UUID fidoUuid : FIDO_UUIDS) {

            if (fidoUuid.equals(uuid)) {