diff options
| author | Etienne Ruffieux <eruffieux@google.com> | 2022-03-15 16:14:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-03-15 16:14:49 +0000 |
| commit | 6c5e19d9d6d237cfac94e5ce3df4e4d19c52901c (patch) | |
| tree | 5684806888973633d6c133a94f8e021a8ffe7ef1 | |
| parent | 9fcba3b49b0d125a2ad84f840407dd73da29bfdc (diff) | |
| parent | 4d34c1b4b0296721fa76185332374913189bb552 (diff) | |
Merge "[API Review] Removed unnecessary SystemApi annotations" into tm-dev
| -rw-r--r-- | framework/api/system-current.txt | 8 | ||||
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 3 |
2 files changed, 0 insertions, 11 deletions
diff --git a/framework/api/system-current.txt b/framework/api/system-current.txt index b8ddbf07aa..e29699beed 100644 --- a/framework/api/system-current.txt +++ b/framework/api/system-current.txt @@ -70,7 +70,6 @@ package android.bluetooth { method public boolean isLeEnabled(); method @NonNull public static String nameForState(int); method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean registerBluetoothConnectionCallback(@NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothAdapter.BluetoothConnectionCallback); - method public boolean registerServiceLifecycleCallback(@NonNull android.bluetooth.BluetoothAdapter.ServiceLifecycleCallback); method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean removeActiveDevice(int); method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean removeOnMetadataChangedListener(@NonNull android.bluetooth.BluetoothDevice, @NonNull android.bluetooth.BluetoothAdapter.OnMetadataChangedListener); method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void requestControllerActivityEnergyInfo(@NonNull android.os.ResultReceiver); @@ -81,7 +80,6 @@ package android.bluetooth { method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int startRfcommServer(@NonNull String, @NonNull java.util.UUID, @NonNull android.app.PendingIntent); method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int stopRfcommServer(@NonNull java.util.UUID); method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean unregisterBluetoothConnectionCallback(@NonNull android.bluetooth.BluetoothAdapter.BluetoothConnectionCallback); - method public void unregisterServiceLifecycleCallback(@NonNull android.bluetooth.BluetoothAdapter.ServiceLifecycleCallback); field public static final String ACTION_BLE_STATE_CHANGED = "android.bluetooth.adapter.action.BLE_STATE_CHANGED"; field public static final String ACTION_REQUEST_BLE_SCAN_ALWAYS_AVAILABLE = "android.bluetooth.adapter.action.REQUEST_BLE_SCAN_ALWAYS_AVAILABLE"; field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_REQUEST_DISABLE = "android.bluetooth.adapter.action.REQUEST_DISABLE"; @@ -108,12 +106,6 @@ package android.bluetooth { method public void onOobData(int, @NonNull android.bluetooth.OobData); } - public abstract static class BluetoothAdapter.ServiceLifecycleCallback { - ctor public BluetoothAdapter.ServiceLifecycleCallback(); - method public abstract void onBluetoothServiceDown(); - method public abstract void onBluetoothServiceUp(); - } - public final class BluetoothClass implements android.os.Parcelable { field public static final int PROFILE_A2DP_SINK = 6; // 0x6 field public static final int PROFILE_NAP = 5; // 0x5 diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index 2f9a981125..01bc1bade2 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -4125,7 +4125,6 @@ public final class BluetoothAdapter { * @hide */ @RequiresNoPermission - @SystemApi public boolean registerServiceLifecycleCallback(@NonNull ServiceLifecycleCallback callback) { return getBluetoothService(callback.mRemote) != null; } @@ -4136,7 +4135,6 @@ public final class BluetoothAdapter { * @hide */ @RequiresNoPermission - @SystemApi public void unregisterServiceLifecycleCallback(@NonNull ServiceLifecycleCallback callback) { removeServiceStateCallback(callback.mRemote); } @@ -4146,7 +4144,6 @@ public final class BluetoothAdapter { * * @hide */ - @SystemApi public abstract static class ServiceLifecycleCallback { /** Called when the bluetooth stack is up */ |