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

am de35f0d9: Merge "setCallbackType should be public for onlost/onfound apis" into mnc-dev

Browse Source 
* commit 'de35f0d9525d0ca0cd109a9e848a3885bd9c3c1d':
  setCallbackType should be public for onlost/onfound apis
This commit is contained in:
Wei Wang
2015-05-19 22:13:45 +00:00
committed by Android Git Automerger
parent 2d5d8926ea de35f0d952
commit 78011ba9db
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -7160,6 +7160,7 @@ package android.bluetooth.le {
public static final class ScanSettings.Builder {
ctor public ScanSettings.Builder();
method public android.bluetooth.le.ScanSettings build();
method public android.bluetooth.le.ScanSettings.Builder setCallbackType(int);
method public android.bluetooth.le.ScanSettings.Builder setMatchMode(int);
method public android.bluetooth.le.ScanSettings.Builder setNumOfMatches(int);
method public android.bluetooth.le.ScanSettings.Builder setReportDelay(long);

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

@@ -249,9 +249,7 @@ public final class ScanSettings implements Parcelable {
*
* @param callbackType The callback type flags for the scan.
* @throws IllegalArgumentException If the {@code callbackType} is invalid.
* @hide
*/
@SystemApi
public Builder setCallbackType(int callbackType) {
if (!isValidCallbackType(callbackType)) {