summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJakub Pawlowski <jpawlowski@google.com>2021-07-14 18:08:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-07-14 18:08:44 +0000
commit00193cb288d120d76a900c0709f16b07a40f39b8 (patch)
treeb35eef0ca6d3040f032a0d75e9d274c5de881c67 /core/java
parenta0b71959f9231ebf97737c96fcab6670538d2fbd (diff)
parentf4c0d7097c62eaf76424251eb217aa65fdf4e328 (diff)
Merge changes from topic "cherrypick-BT-result-storage-descriptor-remove-t1jhhedypv" into sc-dev-plus-aosp am: f4c0d7097c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15278137 Change-Id: I2764646b0f0a5b4f811defb5b2d8dbc285fd971f
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/bluetooth/le/BluetoothLeScanner.java3
-rw-r--r--core/java/android/bluetooth/le/ResultStorageDescriptor.java3
-rw-r--r--core/java/android/bluetooth/le/TruncatedFilter.java3
3 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/bluetooth/le/BluetoothLeScanner.java b/core/java/android/bluetooth/le/BluetoothLeScanner.java
index e6de3d7cfb3e..ee173dbc4ad4 100644
--- a/core/java/android/bluetooth/le/BluetoothLeScanner.java
+++ b/core/java/android/bluetooth/le/BluetoothLeScanner.java
@@ -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)
diff --git a/core/java/android/bluetooth/le/ResultStorageDescriptor.java b/core/java/android/bluetooth/le/ResultStorageDescriptor.java
index 796c815d69bb..f65048975deb 100644
--- a/core/java/android/bluetooth/le/ResultStorageDescriptor.java
+++ b/core/java/android/bluetooth/le/ResultStorageDescriptor.java
@@ -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;
diff --git a/core/java/android/bluetooth/le/TruncatedFilter.java b/core/java/android/bluetooth/le/TruncatedFilter.java
index 93f526bb9f09..25925888a0d2 100644
--- a/core/java/android/bluetooth/le/TruncatedFilter.java
+++ b/core/java/android/bluetooth/le/TruncatedFilter.java
@@ -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 {