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

Commit 54b9538d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Private GATT] Enforce NRPA for private GATT" am: c2cdcbf3 am: d9c9de65 

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



Change-Id: Idb7088d522242dd0d1d654a4a0b3daca484c8850
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b930855e d9c9de65

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

+14 −0
Original line number Diff line number Diff line
@@ -211,6 +211,20 @@ public class AdvertiseManager { 
            AdvertiseData scanResponse, PeriodicAdvertisingParameters periodicParameters,

            AdvertiseData periodicData, int duration, int maxExtAdvEvents, int serverIf,

            IAdvertisingSetCallback callback) {

        // If we are using an isolated server, force usage of an NRPA

        if (serverIf != 0

                && parameters.getOwnAddressType()

                        != AdvertisingSetParameters.ADDRESS_TYPE_RANDOM_NON_RESOLVABLE) {

            Log.w(TAG, "Cannot advertise an isolated GATT server using a resolvable address");

            try {

                callback.onAdvertisingSetStarted(

                        0x00, 0x00, AdvertiseCallback.ADVERTISE_FAILED_INTERNAL_ERROR);

            } catch (RemoteException exception) {

                Log.e(TAG, "Failed to callback:" + Log.getStackTraceString(exception));

            }

            return;

        }



        AdvertisingSetDeathRecipient deathRecipient = new AdvertisingSetDeathRecipient(callback);

        IBinder binder = toBinder(callback);

        try {