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

Commit ff701358 authored by Mathew Inwood's avatar Mathew Inwood Committed by android-build-merger
Browse files

Merge "Limit access to suspected false positives." am: aeda49d185 

am: fec6ac71

Change-Id: I8e10322e69d2d479079df5cf8fec0287c7c117f1
parents 24f0eac5 fec6ac71

framework/java/android/bluetooth/BluetoothA2dp.java

+1 −1
Original line number Diff line number Diff line
@@ -878,7 +878,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     *

     * @hide

     */

    @UnsupportedAppUsage

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

    public static String stateToString(int state) {

        switch (state) {

            case STATE_DISCONNECTED:

framework/java/android/bluetooth/BluetoothClass.java

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


import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.os.Build;

import android.os.Parcel;

import android.os.Parcelable;
@@ -65,7 +66,7 @@ public final class BluetoothClass implements Parcelable { 
    private final int mClass;



    /** @hide */

    @UnsupportedAppUsage

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

    public BluetoothClass(int classInt) {

        mClass = classInt;

    }

framework/java/android/bluetooth/BluetoothUuid.java

+5 −4
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.ParcelUuid;



import java.nio.ByteBuffer;
@@ -38,20 +39,20 @@ public final class BluetoothUuid { 
     * The following 128 bit values are calculated as:

     *  uuid * 2^96 + BASE_UUID

     */

    @UnsupportedAppUsage

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

    public static final ParcelUuid AudioSink =

            ParcelUuid.fromString("0000110B-0000-1000-8000-00805F9B34FB");

    public static final ParcelUuid AudioSource =

            ParcelUuid.fromString("0000110A-0000-1000-8000-00805F9B34FB");

    @UnsupportedAppUsage

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

    public static final ParcelUuid AdvAudioDist =

            ParcelUuid.fromString("0000110D-0000-1000-8000-00805F9B34FB");

    @UnsupportedAppUsage

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

    public static final ParcelUuid HSP =

            ParcelUuid.fromString("00001108-0000-1000-8000-00805F9B34FB");

    public static final ParcelUuid HSP_AG =

            ParcelUuid.fromString("00001112-0000-1000-8000-00805F9B34FB");

    @UnsupportedAppUsage

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

    public static final ParcelUuid Handsfree =

            ParcelUuid.fromString("0000111E-0000-1000-8000-00805F9B34FB");

    public static final ParcelUuid Handsfree_AG =