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

Commit 484573f0 authored by Mathew Inwood's avatar Mathew Inwood Committed by Nathan Harold
Browse files

Move some members to the "Q blacklist". 

Based on some analysis, these fields/methods are likely false positives.
Set maxTargetSdk=P so that any apps using them are required to migrate off
them in future. See the bug for more details.

Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.

Bug: 115609023
Test: m
Merged-In: I719b5c94e5b1f4fa562dd5d655953422958ad37e
Change-Id: I719b5c94e5b1f4fa562dd5d655953422958ad37e
(cherry picked from commit 7e50b2e0)
parent 49651ddf

framework/java/android/bluetooth/BluetoothA2dp.java

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.ServiceConnection;

import android.os.Binder;

import android.os.Build;

import android.os.IBinder;

import android.os.ParcelUuid;

import android.os.RemoteException;
@@ -571,7 +572,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    public int getPriority(BluetoothDevice device) {

        if (VDBG) log("getPriority(" + device + ")");

        try {

framework/java/android/bluetooth/BluetoothGatt.java

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.bluetooth;



import android.annotation.UnsupportedAppUsage;

import android.os.Build;

import android.os.Handler;

import android.os.ParcelUuid;

import android.os.RemoteException;
@@ -52,7 +53,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
    private BluetoothDevice mDevice;

    @UnsupportedAppUsage

    private boolean mAutoConnect;

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    private int mAuthRetryState;

    private int mConnState;

    private final Object mStateLock = new Object();

framework/java/android/bluetooth/BluetoothProfile.java

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.Manifest; 
import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.UnsupportedAppUsage;

import android.os.Build;



import java.util.List;
@@ -86,7 +87,7 @@ public interface BluetoothProfile { 
     *

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    int PAN = 5;



    /**