diff options
| author | 2025-01-14 15:21:55 -0800 | |
|---|---|---|
| committer | 2025-01-14 15:21:55 -0800 | |
| commit | fa4a7d1f6de8433638992eba95c61ccefaef807d (patch) | |
| tree | f34dd4b5629f1843581b1db6bdc95b4fb4170c18 | |
| parent | b92059d5d328460a16d1075a88c1ac8a31093818 (diff) | |
| parent | 9a6d2b98ab12c62100176ea057020d7b0f6caae3 (diff) | |
Merge "Soft remove BluetoothLeScanner#startTruncatedScan" into main
| -rw-r--r-- | framework/api/system-current.txt | 1 | ||||
| -rw-r--r-- | framework/api/system-removed.txt | 8 | ||||
| -rw-r--r-- | framework/java/android/bluetooth/le/BluetoothLeScanner.java | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/framework/api/system-current.txt b/framework/api/system-current.txt index cfa9c8dad4..5a506f21fb 100644 --- a/framework/api/system-current.txt +++ b/framework/api/system-current.txt @@ -1416,7 +1416,6 @@ 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 @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 ChannelSoundingParams implements android.os.Parcelable { diff --git a/framework/api/system-removed.txt b/framework/api/system-removed.txt index d802177e24..ac62cca0a3 100644 --- a/framework/api/system-removed.txt +++ b/framework/api/system-removed.txt @@ -1 +1,9 @@ // Signature format: 2.0 +package android.bluetooth.le { + + public final class BluetoothLeScanner { + 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); + } + +} + diff --git a/framework/java/android/bluetooth/le/BluetoothLeScanner.java b/framework/java/android/bluetooth/le/BluetoothLeScanner.java index 1d6087b19e..c116540496 100644 --- a/framework/java/android/bluetooth/le/BluetoothLeScanner.java +++ b/framework/java/android/bluetooth/le/BluetoothLeScanner.java @@ -348,7 +348,7 @@ public final class BluetoothLeScanner { /** * Start truncated scan. * - * @deprecated this is not used anywhere + * @removed this is not used anywhere * @hide */ @Deprecated |