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

Commit 6468b975 authored by William Escande's avatar William Escande
Browse files

24Q4: Removal of override_context_to_specify_device_id 

Bug: 349657939
Fix: 349657939
Flag: com.android.bluetooth.flags.override_context_to_specify_device_id
Test: m . | Tested by soaking and QA and flag release
Change-Id: I7ff3902672d0341a13866a62224802f01a4c7929
parent 64c21f12

flags/framework.aconfig

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

container: "com.android.btservices"



flag {

    name: "override_context_to_specify_device_id"

    namespace: "bluetooth"

    description: "In Bluetooth Manager, override the context with createDeviceContext to pin a specific DeviceId"

    bug: "349657939"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "support_metadata_device_types_apis"

    is_exported: true

framework/java/android/bluetooth/BluetoothManager.java

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public final class BluetoothManager { 


    /** @hide */

    public BluetoothManager(Context context) {

        if (com.android.bluetooth.flags.Flags.overrideContextToSpecifyDeviceId() && isAtLeastU()) {

        if (isAtLeastU()) {

            // Pin the context DeviceId prevent the associated attribution source to be obsolete

            // TODO: b/343739429 -- pass the context to BluetoothAdapter constructor instead

            mContext = context.createDeviceContext(Context.DEVICE_ID_DEFAULT);