summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJakub Pawlowski <jpawlowski@google.com>2017-03-13 18:16:24 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-13 18:16:24 +0000
commit2ebaf34259a7bb116995823339e322e1e0a5d39e (patch)
tree74998a4dafb54b5290da1034598cc8ebacecd93f /core/java
parent4c618d893350c14d215bc3b4eba74a50a5993e66 (diff)
parent58569de4de43e58ca1d9c34ae7062a28d6e2ae5e (diff)
Merge "Bluetooth 5 spelling fixes" am: 5465fe0a2d
am: 58569de4de Change-Id: I6abd6becaf54fd59abe894fc6c71c46ce4361c8d
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/bluetooth/BluetoothAdapter.java4
-rw-r--r--core/java/android/bluetooth/le/AdvertisingSetParameters.java2
-rw-r--r--core/java/android/bluetooth/le/ScanResult.java4
3 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java
index d36692a74a0e..488511b49b88 100644
--- a/core/java/android/bluetooth/BluetoothAdapter.java
+++ b/core/java/android/bluetooth/BluetoothAdapter.java
@@ -1447,9 +1447,9 @@ public final class BluetoothAdapter {
}
/**
- * Return true if LE Periodic Advertising feature is supported.
+ * Return true if LE Extended Advertising feature is supported.
*
- * @return true if chipset supports LE Periodic Advertising feature
+ * @return true if chipset supports LE Extended Advertising feature
*/
public boolean isLeExtendedAdvertisingSupported() {
if (!getLeAccess()) return false;
diff --git a/core/java/android/bluetooth/le/AdvertisingSetParameters.java b/core/java/android/bluetooth/le/AdvertisingSetParameters.java
index 03a01e171ba4..453dd70a589c 100644
--- a/core/java/android/bluetooth/le/AdvertisingSetParameters.java
+++ b/core/java/android/bluetooth/le/AdvertisingSetParameters.java
@@ -284,7 +284,7 @@ public final class AdvertisingSetParameters implements Parcelable {
*
* @param isAnonymous wether anonymous advertising should be used.
*/
- public Builder setAnonymouus(boolean isAnonymous) {
+ public Builder setAnonymous(boolean isAnonymous) {
this.isAnonymous = isAnonymous;
return this;
}
diff --git a/core/java/android/bluetooth/le/ScanResult.java b/core/java/android/bluetooth/le/ScanResult.java
index 583ddd20fd7f..745cd16c78f9 100644
--- a/core/java/android/bluetooth/le/ScanResult.java
+++ b/core/java/android/bluetooth/le/ScanResult.java
@@ -67,12 +67,12 @@ public final class ScanResult implements Parcelable {
public static final int SID_NOT_PRESENT = 0xFF;
/**
- * Mask for checking wether event type represents legacy advertisement.
+ * Mask for checking whether event type represents legacy advertisement.
*/
private static final int ET_LEGACY_MASK = 0x10;
/**
- * Mask for checking wether event type represents connectable advertisement.
+ * Mask for checking whether event type represents connectable advertisement.
*/
private static final int ET_CONNECTABLE_MASK = 0x01;