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

Commit 8a45d959 authored by Angela Wang's avatar Angela Wang Committed by Automerger Merge Worker
Browse files

Merge "Remove flag mfi_has_uuid" into main am: fdab89a1 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3144976



Change-Id: I9d060005e20ab6a948b162d01603345df0eef684
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2f0c724b fdab89a1

flags/framework.aconfig

+0 −8
Original line number Diff line number Diff line 
package: "com.android.bluetooth.flags"

container: "com.android.btservices"



flag {

    name: "mfi_has_uuid"

    is_exported: true

    namespace: "bluetooth"

    description: "Use MFi HAS uuid to judge if a device is hearing aid"

    bug: "310543599"

}



flag {

    name: "support_metadata_device_types_apis"

    is_exported: true

framework/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ package android.bluetooth { 
    field @NonNull public static final android.os.ParcelUuid MAP;

    field @NonNull public static final android.os.ParcelUuid MAS;

    field @NonNull public static final android.os.ParcelUuid MEDIA_CONTROL;

    field @FlaggedApi("com.android.bluetooth.flags.mfi_has_uuid") @NonNull public static final android.os.ParcelUuid MFI_HAS;

    field @NonNull public static final android.os.ParcelUuid MFI_HAS;

    field @NonNull public static final android.os.ParcelUuid MNS;

    field @NonNull public static final android.os.ParcelUuid NAP;

    field @NonNull public static final android.os.ParcelUuid OBEX_OBJECT_PUSH;

framework/api/system-lint-baseline.txt

+2 −0
Original line number Diff line number Diff line
@@ -69,3 +69,5 @@ UnflaggedApi: android.bluetooth.BluetoothHapClient#switchToPreviousPreset(androi 
    New API must be flagged with @FlaggedApi: method android.bluetooth.BluetoothHapClient.switchToPreviousPreset(android.bluetooth.BluetoothDevice)

UnflaggedApi: android.bluetooth.BluetoothHapClient#switchToPreviousPresetForGroup(int):

    New API must be flagged with @FlaggedApi: method android.bluetooth.BluetoothHapClient.switchToPreviousPresetForGroup(int)

UnflaggedApi: android.bluetooth.BluetoothUuid#MFI_HAS:

    New API must be flagged with @FlaggedApi: field android.bluetooth.BluetoothUuid.MFI_HAS

framework/java/android/bluetooth/BluetoothUuid.java

+0 −4
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.bluetooth;



import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;
@@ -24,8 +23,6 @@ import android.annotation.SystemApi; 
import android.compat.annotation.UnsupportedAppUsage;

import android.os.ParcelUuid;



import com.android.bluetooth.flags.Flags;



import java.nio.ByteBuffer;

import java.nio.ByteOrder;

import java.util.Arrays;
@@ -266,7 +263,6 @@ public final class BluetoothUuid { 
     */

    @NonNull

    @SystemApi

    @FlaggedApi(Flags.FLAG_MFI_HAS_UUID)

    public static final ParcelUuid MFI_HAS =

            ParcelUuid.fromString("7D74F4BD-C74A-4431-862C-CCE884371592");