Merge "Bluetooth API spelling fixes ("wether" -> "whether")" (81cef3ae) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothGatt.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -778,7 +778,7 @@ public final class BluetoothGatt implements BluetoothProfile {

	/**		/**
	* Set the preferred connection PHY for this app. Please note that this is just a		* Set the preferred connection PHY for this app. Please note that this is just a
	* recommendation, wether the PHY change will happen depends on other applications peferences,		* recommendation, whether the PHY change will happen depends on other applications peferences,
	* local and remote controller capabilities. Controller can override these settings.		* local and remote controller capabilities. Controller can override these settings.
	* <p>		* <p>
	* {@link BluetoothGattCallback#onPhyUpdate} will be triggered as a result of this call, even		* {@link BluetoothGattCallback#onPhyUpdate} will be triggered as a result of this call, even

core/java/android/bluetooth/BluetoothGattServer.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -550,7 +550,7 @@ public final class BluetoothGattServer implements BluetoothProfile {

	/**		/**
	* Set the preferred connection PHY for this app. Please note that this is just a		* Set the preferred connection PHY for this app. Please note that this is just a
	* recommendation, wether the PHY change will happen depends on other applications peferences,		* recommendation, whether the PHY change will happen depends on other applications peferences,
	* local and remote controller capabilities. Controller can override these settings.		* local and remote controller capabilities. Controller can override these settings.
	* <p>		* <p>
	* {@link BluetoothGattServerCallback#onPhyUpdate} will be triggered as a result of this call, even		* {@link BluetoothGattServerCallback#onPhyUpdate} will be triggered as a result of this call, even

core/java/android/bluetooth/le/AdvertisingSetParameters.java

+5 −5

core/java/android/bluetooth/le/PeriodicAdvertisingParameters.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -93,7 +93,7 @@ public final class PeriodicAdvertisingParameters implements Parcelable {
	private int interval = INTERVAL_MAX;		private int interval = INTERVAL_MAX;

	/**		/**
	* Set wether the Periodic Advertising should be enabled for this set.		* Set whether the Periodic Advertising should be enabled for this set.
	*/		*/
	public Builder setEnable(boolean enable) {		public Builder setEnable(boolean enable) {
	this.enable = enable;		this.enable = enable;

Original line number	Original line	Diff line number	Diff line
	@@ -279,7 +279,7 @@ public final class AdvertisingSetParameters implements Parcelable {
	* When set to true, advertising set will advertise 4.x Spec compliant		* When set to true, advertising set will advertise 4.x Spec compliant
	* advertisements.		* advertisements.
	*		*
	* @param isLegacy wether legacy advertising mode should be used.		* @param isLegacy whether legacy advertising mode should be used.
	*/		*/
	public Builder setLegacyMode(boolean isLegacy) {		public Builder setLegacyMode(boolean isLegacy) {
	this.isLegacy = isLegacy;		this.isLegacy = isLegacy;
	@@ -287,12 +287,12 @@ public final class AdvertisingSetParameters implements Parcelable {
	}		}

	/**		/**
	* Set wether advertiser address should be ommited from all packets. If this		* Set whether advertiser address should be ommited from all packets. If this
	* mode is used, periodic advertising can't be enabled for this set.		* mode is used, periodic advertising can't be enabled for this set.
	*		*
	* This is used only if legacy mode is not used.		* This is used only if legacy mode is not used.
	*		*
	* @param isAnonymous wether anonymous advertising should be used.		* @param isAnonymous whether anonymous advertising should be used.
	*/		*/
	public Builder setAnonymous(boolean isAnonymous) {		public Builder setAnonymous(boolean isAnonymous) {
	this.isAnonymous = isAnonymous;		this.isAnonymous = isAnonymous;
	@@ -300,11 +300,11 @@ public final class AdvertisingSetParameters implements Parcelable {
	}		}

	/**		/**
	* Set wether TX power should be included in the extended header.		* Set whether TX power should be included in the extended header.
	*		*
	* This is used only if legacy mode is not used.		* This is used only if legacy mode is not used.
	*		*
	* @param includeTxPower wether TX power should be included in extended		* @param includeTxPower whether TX power should be included in extended
	* header		* header
	*/		*/
	public Builder setIncludeTxPower(boolean includeTxPower) {		public Builder setIncludeTxPower(boolean includeTxPower) {