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

Commit a0f0b1c4 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "[API Review] Removed unnecessary SystemApi annotations" into tm-dev am: 6c5e19d9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/17157868

Change-Id: If4baa46dd1ac716ecf286dd9e02adf52a033ec92
parents d21614c1 6c5e19d9

framework/api/system-current.txt

+0 −8
Original line number Diff line number Diff line
@@ -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

framework/java/android/bluetooth/BluetoothAdapter.java

+0 −3
Original line number Diff line number Diff line
@@ -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 */