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

Commit a8e0a85d authored by Mathew Inwood's avatar Mathew Inwood Committed by Gerrit Code Review
Browse files

Merge "Derestrict some non-SDK APIs."

parents 5d55645d b426f901

framework/java/android/bluetooth/BluetoothA2dp.java

+3 −3
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 171933273)

    public static final String ACTION_ACTIVE_DEVICE_CHANGED =

            "android.bluetooth.a2dp.profile.action.ACTIVE_DEVICE_CHANGED";
@@ -409,7 +409,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 171933273)

    public boolean setActiveDevice(@Nullable BluetoothDevice device) {

        if (DBG) log("setActiveDevice(" + device + ")");

        try {
@@ -433,7 +433,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * is active

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 171933273)

    @Nullable

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public BluetoothDevice getActiveDevice() {

framework/java/android/bluetooth/BluetoothAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -1174,7 +1174,7 @@ public final class BluetoothAdapter { 
     * @return true to indicate adapter shutdown has begun, or false on immediate error

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 171933273)

    public boolean disable(boolean persist) {



        try {

framework/java/android/bluetooth/BluetoothHeadset.java

+3 −3
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 
     * @hide

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 171933273)

    public static final String ACTION_ACTIVE_DEVICE_CHANGED =

            "android.bluetooth.headset.profile.action.ACTIVE_DEVICE_CHANGED";
@@ -1172,7 +1172,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 
     * @hide

     */

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 171933273)

    public boolean setActiveDevice(@Nullable BluetoothDevice device) {

        if (DBG) {

            Log.d(TAG, "setActiveDevice: " + device);
@@ -1198,7 +1198,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 
     * is active.

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 171933273)

    @Nullable

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public BluetoothDevice getActiveDevice() {