diff options
| author | 2025-02-12 17:05:14 -0800 | |
|---|---|---|
| committer | 2025-02-12 17:05:14 -0800 | |
| commit | eedfa8eed4b207dc54c3f4d47926f751e6543915 (patch) | |
| tree | 91757c5b72c504905b5e90ec5c794e4662f79d5e | |
| parent | 0ba05d6023e15878b8aa4dfa1ef20e580473d398 (diff) | |
24Q3: Remove flag support_exclusive_manager
Bug: 319716512
Test: m com.android.bt
Flag: com::android::bluetooth::flags::support_exclusive_manager
Change-Id: I29ce953ad3a480898e2f396297161c77323a3296
| -rw-r--r-- | flags/framework.aconfig | 8 | ||||
| -rw-r--r-- | framework/api/system-current.txt | 2 | ||||
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothDevice.java | 1 |
3 files changed, 1 insertions, 10 deletions
diff --git a/flags/framework.aconfig b/flags/framework.aconfig index df4cf067f5..9e38015d0b 100644 --- a/flags/framework.aconfig +++ b/flags/framework.aconfig @@ -10,14 +10,6 @@ flag { } flag { - name: "support_exclusive_manager" - is_exported: true - namespace: "bluetooth" - description: "Support setting/retrieving the exclusive manager app for a BluetoothDevice" - bug: "319716512" -} - -flag { name: "identity_address_null_if_not_known" namespace: "bluetooth" description: "Return null for identity address if identity address is not known" diff --git a/framework/api/system-current.txt b/framework/api/system-current.txt index 60657262e3..10bdab4b5c 100644 --- a/framework/api/system-current.txt +++ b/framework/api/system-current.txt @@ -316,7 +316,7 @@ package android.bluetooth { field public static final int METADATA_COMPANION_APP = 4; // 0x4 field public static final int METADATA_DEVICE_TYPE = 17; // 0x11 field public static final int METADATA_ENHANCED_SETTINGS_UI_URI = 16; // 0x10 - field @FlaggedApi("com.android.bluetooth.flags.support_exclusive_manager") public static final int METADATA_EXCLUSIVE_MANAGER = 29; // 0x1d + field public static final int METADATA_EXCLUSIVE_MANAGER = 29; // 0x1d field public static final int METADATA_HARDWARE_VERSION = 3; // 0x3 field @FlaggedApi("com.android.bluetooth.flags.support_remote_device_metadata") public static final int METADATA_HEAD_UNIT_BUILD = 33; // 0x21 field @FlaggedApi("com.android.bluetooth.flags.support_remote_device_metadata") public static final int METADATA_HEAD_UNIT_MANUFACTURER_NAME = 31; // 0x1f diff --git a/framework/java/android/bluetooth/BluetoothDevice.java b/framework/java/android/bluetooth/BluetoothDevice.java index 439c9349cb..a4cacbf0a8 100644 --- a/framework/java/android/bluetooth/BluetoothDevice.java +++ b/framework/java/android/bluetooth/BluetoothDevice.java @@ -895,7 +895,6 @@ public final class BluetoothDevice implements Parcelable, Attributable { * * @hide */ - @FlaggedApi(Flags.FLAG_SUPPORT_EXCLUSIVE_MANAGER) @SystemApi public static final int METADATA_EXCLUSIVE_MANAGER = 29; |