Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00193cb2 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

Merge changes from topic... 

Merge changes from topic "cherrypick-BT-result-storage-descriptor-remove-t1jhhedypv" into sc-dev-plus-aosp am: f4c0d709

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15278137

Change-Id: I2764646b0f0a5b4f811defb5b2d8dbc285fd971f
parents a0b71959 f4c0d709

core/api/system-current.txt

+13 −13
Original line number Diff line number Diff line
@@ -2213,17 +2213,17 @@ package android.bluetooth.le { 
  public final class BluetoothLeScanner {

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.UPDATE_DEVICE_STATS}) public void startScanFromSource(android.os.WorkSource, android.bluetooth.le.ScanCallback);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_SCAN, 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 @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public void startTruncatedScan(java.util.List<android.bluetooth.le.TruncatedFilter>, android.bluetooth.le.ScanSettings, android.bluetooth.le.ScanCallback);

    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) 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 {









@@ -2247,10 +2247,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();















  }





























}

























core/java/android/bluetooth/le/BluetoothLeScanner.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -356,8 +356,11 @@ public final class BluetoothLeScanner {













    /**















     * Start truncated scan.















     *













     * @deprecated this is not used anywhere













     *















     * @hide















     */













    @Deprecated















    @SystemApi















    @RequiresBluetoothScanPermission















    @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN)

































core/java/android/bluetooth/le/ResultStorageDescriptor.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -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;

































core/java/android/bluetooth/le/TruncatedFilter.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -24,8 +24,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















@SuppressLint("AndroidFrameworkBluetoothPermission")















public final class TruncatedFilter {