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

Commit 88ffdfe8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove non logical permission on api"

parents 5f48c3a4 44ed8702

framework/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -604,8 +604,8 @@ package android.bluetooth { 
  }



  public interface BluetoothProfile {

    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public static String getConnectionStateName(int);

    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public static String getProfileName(int);

    method @NonNull public static String getConnectionStateName(int);

    method @NonNull public static String getProfileName(int);

    field public static final int A2DP_SINK = 11; // 0xb

    field public static final int AVRCP_CONTROLLER = 12; // 0xc

    field public static final int CONNECTION_POLICY_ALLOWED = 100; // 0x64

framework/java/android/bluetooth/BluetoothProfile.java

+2 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.bluetooth; 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.RequiresNoPermission;

import android.annotation.RequiresPermission;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.compat.annotation.UnsupportedAppUsage;
@@ -413,7 +412,7 @@ public interface BluetoothProfile { 
     */

    @SystemApi

    @NonNull

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    @RequiresNoPermission

    static String getConnectionStateName(int connectionState) {

        switch (connectionState) {

            case STATE_DISCONNECTED:
@@ -438,7 +437,7 @@ public interface BluetoothProfile { 
     */

    @SystemApi

    @NonNull

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    @RequiresNoPermission

    static String getProfileName(int profile) {

        switch(profile) {

            case HEADSET: