diff options
| author | Scott Lobdell <slobdell@google.com> | 2022-03-12 18:29:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-03-12 18:29:42 +0000 |
| commit | a1ee0132fb60762afd5e6a2d8259cec2a549aea3 (patch) | |
| tree | fb076df85657d65472d1e6e373161849d7998882 /framework/java/android/bluetooth/BluetoothProfile.java | |
| parent | 8aa895da9cff3e56e056b033afb94bd017e29682 (diff) | |
| parent | d29385cb9c32992e7a12c16521fc306ba44de206 (diff) | |
Merge changes from topic "TP1A.220225.003" into t-keystone-qcom-dev
* changes:
Disable call to Process.getPidsForCommand().
Merge TP1A.220225.003
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothProfile.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothProfile.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/framework/java/android/bluetooth/BluetoothProfile.java b/framework/java/android/bluetooth/BluetoothProfile.java index 86606d2077..ff95269c30 100644 --- a/framework/java/android/bluetooth/BluetoothProfile.java +++ b/framework/java/android/bluetooth/BluetoothProfile.java @@ -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; @@ -457,7 +456,7 @@ public interface BluetoothProfile { */ @SystemApi @NonNull - @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) + @RequiresNoPermission static String getConnectionStateName(int connectionState) { switch (connectionState) { case STATE_DISCONNECTED: @@ -482,7 +481,7 @@ public interface BluetoothProfile { */ @SystemApi @NonNull - @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) + @RequiresNoPermission static String getProfileName(int profile) { switch(profile) { case HEADSET: |