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

Commit 6c629f34 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge "Relax ACTION_TETHERING_STATE_CHANGED permissions." into sc-dev am: 6e8cafb8 am: 1abe9e5d 

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

Change-Id: If3e72177896d1e59d53ba2a12077458a55332243
parents 01898a5e 1abe9e5d

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2055,7 +2055,7 @@ package android.bluetooth { 
    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED, android.Manifest.permission.TETHER_PRIVILEGED}) public void setBluetoothTethering(boolean);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.pan.profile.action.CONNECTION_STATE_CHANGED";

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_TETHERING_STATE_CHANGED = "android.bluetooth.action.TETHERING_STATE_CHANGED";

    field public static final String ACTION_TETHERING_STATE_CHANGED = "android.bluetooth.action.TETHERING_STATE_CHANGED";

    field public static final String EXTRA_LOCAL_ROLE = "android.bluetooth.pan.extra.LOCAL_ROLE";

    field public static final String EXTRA_TETHERING_STATE = "android.bluetooth.extra.TETHERING_STATE";

    field public static final int LOCAL_NAP_ROLE = 1; // 0x1

core/java/android/bluetooth/BluetoothPan.java

+0 −2
Original line number Diff line number Diff line
@@ -108,8 +108,6 @@ public final class BluetoothPan implements BluetoothProfile { 
     * {@link #TETHERING_STATE_ON}

     */

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_TETHERING_STATE_CHANGED =

            "android.bluetooth.action.TETHERING_STATE_CHANGED";