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

Merge changes from topic "cherrypick-BT-result-storage-descriptor" am: 245ce4d049

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1765907

Change-Id: Ifd5482b6d0bfc5d185608ca113490704644405af
This commit is contained in:
Jakub Pawlowski
2021-07-14 20:45:29 +00:00
committed by Automerger Merge Worker
parent 9cf37f5fe7 245ce4d049
commit aee55feaa6
4 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/api/system-current.txt
View File

@@ -1752,17 +1752,17 @@ package android.bluetooth.le {
public final class BluetoothLeScanner {
method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_ADMIN, android.Manifest.permission.UPDATE_DEVICE_STATS}) public void startScanFromSource(android.os.WorkSource, android.bluetooth.le.ScanCallback);
method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_ADMIN, android.Manifest.permission.UPDATE_DEVICE_STATS}) public void startScanFromSource(java.util.List<android.bluetooth.le.ScanFilter>, android.bluetooth.le.ScanSettings, android.os.WorkSource, android.bluetooth.le.ScanCallback);
method public void startTruncatedScan(java.util.List<android.bluetooth.le.TruncatedFilter>, android.bluetooth.le.ScanSettings, android.bluetooth.le.ScanCallback);
method @Deprecated public void startTruncatedScan(java.util.List<android.bluetooth.le.TruncatedFilter>, android.bluetooth.le.ScanSettings, android.bluetooth.le.ScanCallback);
}
public final class ResultStorageDescriptor implements android.os.Parcelable {
ctor public ResultStorageDescriptor(int, int, int);
method public int describeContents();
method public int getLength();
method public int getOffset();
method public int getType();
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.ResultStorageDescriptor> CREATOR;
@Deprecated public final class ResultStorageDescriptor implements android.os.Parcelable {
ctor @Deprecated public ResultStorageDescriptor(int, int, int);
method @Deprecated public int describeContents();
method @Deprecated public int getLength();
method @Deprecated public int getOffset();
method @Deprecated public int getType();
method @Deprecated public void writeToParcel(android.os.Parcel, int);
field @Deprecated @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.ResultStorageDescriptor> CREATOR;
}
public final class ScanFilter implements android.os.Parcelable {
@@ -1786,10 +1786,10 @@ package android.bluetooth.le {
method public android.bluetooth.le.ScanSettings.Builder setScanResultType(int);
}
public final class TruncatedFilter {
ctor public TruncatedFilter(android.bluetooth.le.ScanFilter, java.util.List<android.bluetooth.le.ResultStorageDescriptor>);
method public android.bluetooth.le.ScanFilter getFilter();
method public java.util.List<android.bluetooth.le.ResultStorageDescriptor> getStorageDescriptors();
@Deprecated public final class TruncatedFilter {
ctor @Deprecated public TruncatedFilter(android.bluetooth.le.ScanFilter, java.util.List<android.bluetooth.le.ResultStorageDescriptor>);
method @Deprecated public android.bluetooth.le.ScanFilter getFilter();
method @Deprecated public java.util.List<android.bluetooth.le.ResultStorageDescriptor> getStorageDescriptors();
}
}

3
core/java/android/bluetooth/le/BluetoothLeScanner.java
View File

@@ -327,8 +327,11 @@ public final class BluetoothLeScanner {
/**
* Start truncated scan.
*
* @deprecated this is not used anywhere
*
* @hide
*/
@Deprecated
@SystemApi
public void startTruncatedScan(List<TruncatedFilter> truncatedFilters, ScanSettings settings,
final ScanCallback callback) {

3
core/java/android/bluetooth/le/ResultStorageDescriptor.java
View File

@@ -23,8 +23,11 @@ import android.os.Parcelable;
/**
* Describes the way to store scan result.
*
* @deprecated this is not used anywhere
*
* @hide
*/
@Deprecated
@SystemApi
public final class ResultStorageDescriptor implements Parcelable {
private int mType;

3
core/java/android/bluetooth/le/TruncatedFilter.java
View File

@@ -23,8 +23,11 @@ import java.util.List;
/**
* A special scan filter that lets the client decide how the scan record should be stored.
*
* @deprecated this is not used anywhere
*
* @hide
*/
@Deprecated
@SystemApi
public final class TruncatedFilter {
private final ScanFilter mFilter;