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

Commit fc13dae7 authored by Makoto Onuki's avatar Makoto Onuki Committed by Automerger Merge Worker
Browse files

Merge "Remove unnecessarily @System/TestApi annotations" am: 288bf3c9 

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

Change-Id: Id734803b120847615e6b641096d312bf06a67b75
parents 8d375dcc 288bf3c9

framework/java/android/bluetooth/BluetoothHeadsetClient.java

+0 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.bluetooth; 
import android.Manifest;

import android.annotation.NonNull;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.os.Binder;
@@ -587,7 +586,6 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { 
     * @return true if connectionPolicy is set, false on error

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    public boolean setConnectionPolicy(@NonNull BluetoothDevice device,

            @ConnectionPolicy int connectionPolicy) {
@@ -637,7 +635,6 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { 
     * @return connection policy of the device

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public @ConnectionPolicy int getConnectionPolicy(@NonNull BluetoothDevice device) {

        if (VDBG) log("getConnectionPolicy(" + device + ")");

framework/java/android/bluetooth/BluetoothMapClient.java

+0 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.bluetooth; 
import android.Manifest;

import android.annotation.NonNull;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.app.PendingIntent;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;
@@ -276,7 +275,6 @@ public final class BluetoothMapClient implements BluetoothProfile { 
     * @return true if connectionPolicy is set, false on error

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    public boolean setConnectionPolicy(@NonNull BluetoothDevice device,

            @ConnectionPolicy int connectionPolicy) {
@@ -325,7 +323,6 @@ public final class BluetoothMapClient implements BluetoothProfile { 
     * @return connection policy of the device

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    public @ConnectionPolicy int getConnectionPolicy(@NonNull BluetoothDevice device) {

        if (VDBG) Log.d(TAG, "getConnectionPolicy(" + device + ")");

framework/java/android/bluetooth/BluetoothPbapClient.java

+0 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.bluetooth; 
import android.Manifest;

import android.annotation.NonNull;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.content.Context;

import android.os.Binder;

import android.os.IBinder;
@@ -276,7 +275,6 @@ public final class BluetoothPbapClient implements BluetoothProfile { 
     * @return true if connectionPolicy is set, false on error

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    public boolean setConnectionPolicy(@NonNull BluetoothDevice device,

            @ConnectionPolicy int connectionPolicy) {
@@ -329,7 +327,6 @@ public final class BluetoothPbapClient implements BluetoothProfile { 
     * @return connection policy of the device

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    public @ConnectionPolicy int getConnectionPolicy(@NonNull BluetoothDevice device) {

        if (VDBG) {

framework/java/android/bluetooth/BluetoothSap.java

+0 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package android.bluetooth; 


import android.Manifest;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.os.Binder;
@@ -328,7 +327,6 @@ public final class BluetoothSap implements BluetoothProfile { 
     * @return true if connectionPolicy is set, false on error

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    public boolean setConnectionPolicy(BluetoothDevice device,

            @ConnectionPolicy int connectionPolicy) {
@@ -377,7 +375,6 @@ public final class BluetoothSap implements BluetoothProfile { 
     * @return connection policy of the device

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    public @ConnectionPolicy int getConnectionPolicy(BluetoothDevice device) {

        if (VDBG) log("getConnectionPolicy(" + device + ")");