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

Commit bddbb774 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Revert "Add maxTargetSdk restriction to unused APIs." 

This reverts commit bc9a809f.

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?testMethod=testAppZygotePreload&testClass=android.app.cts.ServiceTest&atpConfigName=suite%2Ftest-mapping-presubmit-retry_cloud-tf&testModule=CtsAppTestCases&fkbb=6936597&lkbb=6936969&lkgb=6936551&testResults=true&branch=git_master&target=cf_x86_phone-userdebug>, bug b/171886397

Bug: 171886397
Change-Id: Ibe0f0430a3451477c1ee8ef56a596e91ea1e7672
parent bc9a809f

framework/java/android/bluetooth/BluetoothA2dp.java

+11 −11
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

    public static final String ACTION_ACTIVE_DEVICE_CHANGED =

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

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

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

    @UnsupportedAppUsage

    public static final String ACTION_CODEC_CONFIG_CHANGED =

            "android.bluetooth.a2dp.profile.action.CODEC_CONFIG_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

    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

    @Nullable

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public BluetoothDevice getActiveDevice() {
@@ -651,7 +651,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @return the current codec status

     * @hide

     */

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

    @UnsupportedAppUsage

    @Nullable

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public BluetoothCodecStatus getCodecStatus(@NonNull BluetoothDevice device) {
@@ -680,7 +680,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @param codecConfig the codec configuration preference

     * @hide

     */

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

    @UnsupportedAppUsage

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public void setCodecConfigPreference(@NonNull BluetoothDevice device,

                                         @NonNull BluetoothCodecConfig codecConfig) {
@@ -710,7 +710,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * active A2DP Bluetooth device.

     * @hide

     */

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

    @UnsupportedAppUsage

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public void enableOptionalCodecs(@NonNull BluetoothDevice device) {

        if (DBG) Log.d(TAG, "enableOptionalCodecs(" + device + ")");
@@ -725,7 +725,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * active A2DP Bluetooth device.

     * @hide

     */

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

    @UnsupportedAppUsage

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public void disableOptionalCodecs(@NonNull BluetoothDevice device) {

        if (DBG) Log.d(TAG, "disableOptionalCodecs(" + device + ")");
@@ -766,7 +766,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * OPTIONAL_CODECS_SUPPORTED.

     * @hide

     */

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

    @UnsupportedAppUsage

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    @OptionalCodecsSupportStatus

    public int isOptionalCodecsSupported(@NonNull BluetoothDevice device) {
@@ -792,7 +792,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * OPTIONAL_CODECS_PREF_DISABLED.

     * @hide

     */

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

    @UnsupportedAppUsage

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    @OptionalCodecsPreferenceStatus

    public int isOptionalCodecsEnabled(@NonNull BluetoothDevice device) {
@@ -819,7 +819,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * OPTIONAL_CODECS_PREF_DISABLED.

     * @hide

     */

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

    @UnsupportedAppUsage

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    public void setOptionalCodecsEnabled(@NonNull BluetoothDevice device,

            @OptionalCodecsPreferenceStatus int value) {

framework/java/android/bluetooth/BluetoothA2dpSink.java

+1 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.annotation.SystemApi; 
import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.os.Binder;

import android.os.Build;

import android.os.IBinder;

import android.os.RemoteException;

import android.util.Log;
@@ -159,7 +158,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
     * @return false on immediate error, true otherwise

     * @hide

     */

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

    @UnsupportedAppUsage

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    public boolean disconnect(BluetoothDevice device) {

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

framework/java/android/bluetooth/BluetoothAdapter.java

+3 −4
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import android.compat.annotation.UnsupportedAppUsage; 
import android.content.Context;

import android.os.BatteryStats;

import android.os.Binder;

import android.os.Build;

import android.os.IBinder;

import android.os.ParcelUuid;

import android.os.RemoteException;
@@ -1171,7 +1170,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

    public boolean disable(boolean persist) {



        try {
@@ -1220,7 +1219,7 @@ public final class BluetoothAdapter { 
     * @return true to indicate that the config file was successfully cleared

     * @hide

     */

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

    @UnsupportedAppUsage

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    public boolean factoryReset() {

        try {
@@ -2626,7 +2625,7 @@ public final class BluetoothAdapter { 
     * permissions, or channel in use.

     * @hide

     */

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

    @UnsupportedAppUsage

    public BluetoothServerSocket listenUsingEncryptedRfcommWithServiceRecord(String name, UUID uuid)

            throws IOException {

        return createNewRfcommSocketAndRecord(name, uuid, false, true);

framework/java/android/bluetooth/BluetoothCodecStatus.java

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


import android.annotation.Nullable;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Build;

import android.os.Parcel;

import android.os.Parcelable;
@@ -40,7 +39,7 @@ public final class BluetoothCodecStatus implements Parcelable { 
     * This extra represents the current codec status of the A2DP

     * profile.

     */

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

    @UnsupportedAppUsage

    public static final String EXTRA_CODEC_STATUS =

            "android.bluetooth.extra.CODEC_STATUS";
@@ -199,7 +198,7 @@ public final class BluetoothCodecStatus implements Parcelable { 
     *

     * @return the current codec configuration

     */

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

    @UnsupportedAppUsage

    public @Nullable BluetoothCodecConfig getCodecConfig() {

        return mCodecConfig;

    }
@@ -209,7 +208,7 @@ public final class BluetoothCodecStatus implements Parcelable { 
     *

     * @return an array with the codecs local capabilities

     */

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

    @UnsupportedAppUsage

    public @Nullable BluetoothCodecConfig[] getCodecsLocalCapabilities() {

        return mCodecsLocalCapabilities;

    }
@@ -219,7 +218,7 @@ public final class BluetoothCodecStatus implements Parcelable { 
     *

     * @return an array with the codecs selectable capabilities

     */

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

    @UnsupportedAppUsage

    public @Nullable BluetoothCodecConfig[] getCodecsSelectableCapabilities() {

        return mCodecsSelectableCapabilities;

    }

framework/java/android/bluetooth/BluetoothDevice.java

+12 −13
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.annotation.SystemApi; 
import android.app.PropertyInvalidatedCache;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.os.Build;

import android.os.Handler;

import android.os.Parcel;

import android.os.ParcelUuid;
@@ -370,7 +369,7 @@ public final class BluetoothDevice implements Parcelable { 


    /** @hide */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

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

    @UnsupportedAppUsage

    public static final String ACTION_SDP_RECORD =

            "android.bluetooth.device.action.SDP_RECORD";
@@ -666,7 +665,7 @@ public final class BluetoothDevice implements Parcelable { 
     *

     * @hide

     */

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

    @UnsupportedAppUsage

    public static final int UNBOND_REASON_AUTH_FAILED = 1;



    /**
@@ -675,7 +674,7 @@ public final class BluetoothDevice implements Parcelable { 
     *

     * @hide

     */

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

    @UnsupportedAppUsage

    public static final int UNBOND_REASON_AUTH_REJECTED = 2;



    /**
@@ -690,7 +689,7 @@ public final class BluetoothDevice implements Parcelable { 
     *

     * @hide

     */

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

    @UnsupportedAppUsage

    public static final int UNBOND_REASON_REMOTE_DEVICE_DOWN = 4;



    /**
@@ -698,7 +697,7 @@ public final class BluetoothDevice implements Parcelable { 
     *

     * @hide

     */

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

    @UnsupportedAppUsage

    public static final int UNBOND_REASON_DISCOVERY_IN_PROGRESS = 5;



    /**
@@ -706,7 +705,7 @@ public final class BluetoothDevice implements Parcelable { 
     *

     * @hide

     */

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

    @UnsupportedAppUsage

    public static final int UNBOND_REASON_AUTH_TIMEOUT = 6;



    /**
@@ -714,7 +713,7 @@ public final class BluetoothDevice implements Parcelable { 
     *

     * @hide

     */

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

    @UnsupportedAppUsage

    public static final int UNBOND_REASON_REPEATED_ATTEMPTS = 7;



    /**
@@ -723,7 +722,7 @@ public final class BluetoothDevice implements Parcelable { 
     *

     * @hide

     */

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

    @UnsupportedAppUsage

    public static final int UNBOND_REASON_REMOTE_AUTH_CANCELED = 8;



    /**
@@ -802,7 +801,7 @@ public final class BluetoothDevice implements Parcelable { 
            "android.bluetooth.device.extra.SDP_RECORD";



    /** @hide */

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

    @UnsupportedAppUsage

    public static final String EXTRA_SDP_SEARCH_STATUS =

            "android.bluetooth.device.extra.SDP_SEARCH_STATUS";
@@ -1135,7 +1134,7 @@ public final class BluetoothDevice implements Parcelable { 
     * @return true on success, false on error

     * @hide

     */

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

    @UnsupportedAppUsage

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public boolean setAlias(@NonNull String alias) {

        final IBluetooth service = sService;
@@ -1574,7 +1573,7 @@ public final class BluetoothDevice implements Parcelable { 
     * @return true pin has been set false for error

     * @hide

     */

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

    @UnsupportedAppUsage

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    public boolean setPin(@NonNull String pin) {

        byte[] pinBytes = convertPinToBytes(pin);
@@ -2188,7 +2187,7 @@ public final class BluetoothDevice implements Parcelable { 
     * operations.

     * @hide

     */

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

    @UnsupportedAppUsage

    public BluetoothGatt connectGatt(Context context, boolean autoConnect,

            BluetoothGattCallback callback, int transport,

            boolean opportunistic, int phy, Handler handler) {