diff options
author | Jakub Pawlowski <jpawlowski@google.com> | 2020-12-03 07:00:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-03 07:00:13 +0000 |
commit | a7aa85857d07780e5cba4675bee2b0e94bfc3dd5 (patch) | |
tree | bad11caacc253daafdd6d31c3b6a0bb5ec3fed96 | |
parent | 3f6a89e3a116a1999f6dd8ad0dc56c59b33cce19 (diff) | |
parent | a1c662b6079dbfe31d3fae3ef26f9c6a89e7ca0e (diff) | |
download | Bluetooth-a7aa85857d07780e5cba4675bee2b0e94bfc3dd5.tar.gz |
Check if advertiserId value matches valid advertiser am: 389f39b3d3 am: 1d19ed9219 am: a1c662b607
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/13092202
Change-Id: I1428d2fdb94327e58a7fa0f72a5a31b8b3100fa5
-rw-r--r-- | src/com/android/bluetooth/gatt/AdvertiseManager.java | 42 |
1 files changed, 41 insertions, 1 deletions
diff --git a/src/com/android/bluetooth/gatt/AdvertiseManager.java b/src/com/android/bluetooth/gatt/AdvertiseManager.java index 85917a471..b76d8619d 100644 --- a/src/com/android/bluetooth/gatt/AdvertiseManager.java +++ b/src/com/android/bluetooth/gatt/AdvertiseManager.java @@ -217,7 +217,7 @@ class AdvertiseManager { Map.Entry<IBinder, AdvertiserInfo> entry = findAdvertiser(advertiserId); if (entry == null) { - Log.i(TAG, "onOwnAddressRead() - bad advertiserId " + advertiserId); + Log.w(TAG, "onOwnAddressRead() - bad advertiserId " + advertiserId); return; } @@ -226,6 +226,11 @@ class AdvertiseManager { } void getOwnAddress(int advertiserId) { + Map.Entry<IBinder, AdvertiserInfo> entry = findAdvertiser(advertiserId); + if (entry == null) { + Log.w(TAG, "getOwnAddress() - bad advertiserId " + advertiserId); + return; + } getOwnAddressNative(advertiserId); } @@ -260,37 +265,72 @@ class AdvertiseManager { } void enableAdvertisingSet(int advertiserId, boolean enable, int duration, int maxExtAdvEvents) { + Map.Entry<IBinder, AdvertiserInfo> entry = findAdvertiser(advertiserId); + if (entry == null) { + Log.w(TAG, "enableAdvertisingSet() - bad advertiserId " + advertiserId); + return; + } enableAdvertisingSetNative(advertiserId, enable, duration, maxExtAdvEvents); } void setAdvertisingData(int advertiserId, AdvertiseData data) { + Map.Entry<IBinder, AdvertiserInfo> entry = findAdvertiser(advertiserId); + if (entry == null) { + Log.w(TAG, "setAdvertisingData() - bad advertiserId " + advertiserId); + return; + } String deviceName = AdapterService.getAdapterService().getName(); setAdvertisingDataNative(advertiserId, AdvertiseHelper.advertiseDataToBytes(data, deviceName)); } void setScanResponseData(int advertiserId, AdvertiseData data) { + Map.Entry<IBinder, AdvertiserInfo> entry = findAdvertiser(advertiserId); + if (entry == null) { + Log.w(TAG, "setScanResponseData() - bad advertiserId " + advertiserId); + return; + } String deviceName = AdapterService.getAdapterService().getName(); setScanResponseDataNative(advertiserId, AdvertiseHelper.advertiseDataToBytes(data, deviceName)); } void setAdvertisingParameters(int advertiserId, AdvertisingSetParameters parameters) { + Map.Entry<IBinder, AdvertiserInfo> entry = findAdvertiser(advertiserId); + if (entry == null) { + Log.w(TAG, "setAdvertisingParameters() - bad advertiserId " + advertiserId); + return; + } setAdvertisingParametersNative(advertiserId, parameters); } void setPeriodicAdvertisingParameters(int advertiserId, PeriodicAdvertisingParameters parameters) { + Map.Entry<IBinder, AdvertiserInfo> entry = findAdvertiser(advertiserId); + if (entry == null) { + Log.w(TAG, "setPeriodicAdvertisingParameters() - bad advertiserId " + advertiserId); + return; + } setPeriodicAdvertisingParametersNative(advertiserId, parameters); } void setPeriodicAdvertisingData(int advertiserId, AdvertiseData data) { + Map.Entry<IBinder, AdvertiserInfo> entry = findAdvertiser(advertiserId); + if (entry == null) { + Log.w(TAG, "setPeriodicAdvertisingData() - bad advertiserId " + advertiserId); + return; + } String deviceName = AdapterService.getAdapterService().getName(); setPeriodicAdvertisingDataNative(advertiserId, AdvertiseHelper.advertiseDataToBytes(data, deviceName)); } void setPeriodicAdvertisingEnable(int advertiserId, boolean enable) { + Map.Entry<IBinder, AdvertiserInfo> entry = findAdvertiser(advertiserId); + if (entry == null) { + Log.w(TAG, "setPeriodicAdvertisingEnable() - bad advertiserId " + advertiserId); + return; + } setPeriodicAdvertisingEnableNative(advertiserId, enable); } |