Merge "Merge "Bluetooth: Fix startAdvertisingSet error handling" am:... (ebd94d7c) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/le/BluetoothLeAdvertiser.java

+14 −2

Original line number	Diff line number	Diff line
		@@ -415,7 +415,8 @@ public final class BluetoothLeAdvertiser {
		gatt = mBluetoothManager.getBluetoothGatt();
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to get Bluetooth gatt - ", e);
		throw new IllegalStateException("Failed to get Bluetooth");
		postStartSetFailure(handler, callback, AdvertiseCallback.ADVERTISE_FAILED_INTERNAL_ERROR);
		return;
		}

		IAdvertisingSetCallback wrapped = wrap(callback, handler);
		@@ -429,7 +430,8 @@ public final class BluetoothLeAdvertiser {
		periodicData, duration, maxExtendedAdvertisingEvents, wrapped);
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to start advertising set - ", e);
		throw new IllegalStateException("Failed to start advertising set");
		postStartSetFailure(handler, callback, AdvertiseCallback.ADVERTISE_FAILED_INTERNAL_ERROR);
		return;
		}
		}

		@@ -648,6 +650,16 @@ public final class BluetoothLeAdvertiser {
		};
		}

		private void postStartSetFailure(Handler handler, final AdvertisingSetCallback callback,
		final int error) {
		handler.post(new Runnable() {
		@Override
		public void run() {
		callback.onAdvertisingSetStarted(null, 0, error);
		}
		});
		}

		private void postStartFailure(final AdvertiseCallback callback, final int error) {
		mHandler.post(new Runnable() {
		@Override