Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bluetooth: bluetooth.le API fixes" am: cf95973276 am: 6af9bde898

Browse Source 
am: 62fc08f684

Change-Id: I98bf6fc7d8d58f102b1268cb3e6d27fb6fd86b78
This commit is contained in:
Jakub Pawlowski
2017-04-28 22:02:52 +00:00
committed by android-build-merger
parent ffe7134de5 62fc08f684
commit 9cc225e482
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -8025,7 +8025,7 @@ package android.bluetooth.le {
method public void setAdvertisingData(android.bluetooth.le.AdvertiseData);
method public void setAdvertisingParameters(android.bluetooth.le.AdvertisingSetParameters);
method public void setPeriodicAdvertisingData(android.bluetooth.le.AdvertiseData);
method public void setPeriodicAdvertisingEnable(boolean);
method public void setPeriodicAdvertisingEnabled(boolean);
method public void setPeriodicAdvertisingParameters(android.bluetooth.le.PeriodicAdvertisingParameters);
method public void setScanResponseData(android.bluetooth.le.AdvertiseData);
}

2
api/system-current.txt
View File

@@ -8503,7 +8503,7 @@ package android.bluetooth.le {
method public void setAdvertisingData(android.bluetooth.le.AdvertiseData);
method public void setAdvertisingParameters(android.bluetooth.le.AdvertisingSetParameters);
method public void setPeriodicAdvertisingData(android.bluetooth.le.AdvertiseData);
method public void setPeriodicAdvertisingEnable(boolean);
method public void setPeriodicAdvertisingEnabled(boolean);
method public void setPeriodicAdvertisingParameters(android.bluetooth.le.PeriodicAdvertisingParameters);
method public void setScanResponseData(android.bluetooth.le.AdvertiseData);
}

2
api/test-current.txt
View File

@@ -8056,7 +8056,7 @@ package android.bluetooth.le {
method public void setAdvertisingData(android.bluetooth.le.AdvertiseData);
method public void setAdvertisingParameters(android.bluetooth.le.AdvertisingSetParameters);
method public void setPeriodicAdvertisingData(android.bluetooth.le.AdvertiseData);
method public void setPeriodicAdvertisingEnable(boolean);
method public void setPeriodicAdvertisingEnabled(boolean);
method public void setPeriodicAdvertisingParameters(android.bluetooth.le.PeriodicAdvertisingParameters);
method public void setScanResponseData(android.bluetooth.le.AdvertiseData);
}

2
core/java/android/bluetooth/le/AdvertisingSet.java
View File

@@ -172,7 +172,7 @@ public final class AdvertisingSet {
*
* @param enable whether the periodic advertising should be enabled (true), or disabled (false).
*/
public void setPeriodicAdvertisingEnable(boolean enable) {
public void setPeriodicAdvertisingEnabled(boolean enable) {
try {
gatt.setPeriodicAdvertisingEnable(this.advertiserId, enable);
} catch (RemoteException e) {

2
core/java/android/bluetooth/le/AdvertisingSetCallback.java
View File

@@ -135,7 +135,7 @@ public abstract class AdvertisingSetCallback {
int status) {}
/**
* Callback triggered in response to {@link AdvertisingSet#setPeriodicAdvertisingEnable}
* Callback triggered in response to {@link AdvertisingSet#setPeriodicAdvertisingEnabled}
* indicating result of the operation.
*
* @param advertisingSet The advertising set.

13
core/java/android/bluetooth/le/AdvertisingSetParameters.java
View File

@@ -242,7 +242,7 @@ public final class AdvertisingSetParameters implements Parcelable {
* non-connectable.
* Legacy advertisements can be both connectable and scannable. Non-legacy
* advertisements can be only scannable or only connectable.
* @param connectable Controls whether the advertisment type will be
* @param connectable Controls whether the advertisement type will be
* connectable (true) or non-connectable (false).
*/
public Builder setConnectable(boolean connectable) {
@@ -254,7 +254,7 @@ public final class AdvertisingSetParameters implements Parcelable {
* Set whether the advertisement type should be scannable.
* Legacy advertisements can be both connectable and scannable. Non-legacy
* advertisements can be only scannable or only connectable.
* @param scannable Controls whether the advertisment type will be
* @param scannable Controls whether the advertisement type will be
* scannable (true) or non-scannable (false).
*/
public Builder setScannable(boolean scannable) {
@@ -386,6 +386,7 @@ public final class AdvertisingSetParameters implements Parcelable {
/**
* Build the {@link AdvertisingSetParameters} object.
* @throws IllegalStateException if invalid combination of parameters is used.
*/
public AdvertisingSetParameters build() {
if (isLegacy) {
@@ -394,22 +395,22 @@ public final class AdvertisingSetParameters implements Parcelable {
}
if (connectable == true && scannable == false) {
throw new IllegalArgumentException(
throw new IllegalStateException(
"Legacy advertisement can't be connectable and non-scannable");
}
if (includeTxPower) {
throw new IllegalArgumentException(
throw new IllegalStateException(
"Legacy advertising can't include TX power level in header");
}
} else {
if (connectable && scannable) {
throw new IllegalArgumentException(
throw new IllegalStateException(
"Advertising can't be both connectable and scannable");
}
if (isAnonymous && connectable) {
throw new IllegalArgumentException(
throw new IllegalStateException(
"Advertising can't be both connectable and anonymous");
}
}