From 4cf705e17e393c70486493432d7e596edc8a7f36 Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Thu, 17 Aug 2017 06:15:43 -0700 Subject: [PATCH] Bluetooth: Don't throw exception when stopAdvertisingSet fails When advertising is stopped while Bluetooth is disabled, we should not throw any exceptions, just log the failure. This was the default behaviour before the AdvertisingSet was introduced. Bug: 63819108 Test: manual Change-Id: I518e071b77b127973aee6f24fa6ced4f28bc9531 Merged-In: I518e071b77b127973aee6f24fa6ced4f28bc9531 (cherry picked from commit f73863dc29c5adc70117649d24f9b65f6b3232be) --- core/java/android/bluetooth/le/BluetoothLeAdvertiser.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java b/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java index dfd5996c6a008..fb9b19f1fddc8 100644 --- a/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java +++ b/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java @@ -453,8 +453,7 @@ public final class BluetoothLeAdvertiser { gatt.stopAdvertisingSet(wrapped); } catch (RemoteException e) { Log.e(TAG, "Failed to stop advertising - ", e); - throw new IllegalStateException("Failed to stop advertising"); - } + } } /**