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

Commit 167281cd authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes I34da95f8,I501bcb52,I7c4feb5d,Ic354cc9b into main am: 7ada9e56 

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



Change-Id: I31e88782186e5a46aeab90cbbee6d25c6f65e3f4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6c96c6c 7ada9e56

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+92 −75
Original line number Diff line number Diff line
@@ -340,15 +340,15 @@ public class AdapterService extends Service { 
            mMetadataListeners = new HashMap<>();

    private final HashMap<String, Integer> mProfileServicesState = new HashMap<String, Integer>();

    private Set<IBluetoothConnectionCallback> mBluetoothConnectionCallbacks = new HashSet<>();

    private RemoteCallbackList<IBluetoothPreferredAudioProfilesCallback>

            mPreferredAudioProfilesCallbacks;

    private RemoteCallbackList<IBluetoothQualityReportReadyCallback>

            mBluetoothQualityReportReadyCallbacks;

    private final RemoteCallbackList<IBluetoothPreferredAudioProfilesCallback>

            mPreferredAudioProfilesCallbacks = new RemoteCallbackList<>();

    private final RemoteCallbackList<IBluetoothQualityReportReadyCallback>

            mBluetoothQualityReportReadyCallbacks = new RemoteCallbackList<>();

    // Map<groupId, PendingAudioProfilePreferenceRequest>

    private final Map<Integer, PendingAudioProfilePreferenceRequest>

            mCsipGroupsPendingAudioProfileChanges = new HashMap<>();

    // Only BluetoothManagerService should be registered

    private RemoteCallbackList<IBluetoothCallback> mRemoteCallbacks;

    private final RemoteCallbackList<IBluetoothCallback>

            mRemoteCallbacks = new RemoteCallbackList<>();

    private final Map<BluetoothStateCallback, Executor> mLocalCallbacks = new ConcurrentHashMap<>();

    private int mCurrentRequestId;

    private boolean mQuietmode = false;
@@ -525,7 +525,7 @@ public class AdapterService extends Service { 
                    }

                    mRunningProfiles.add(profile);

                    // TODO(b/228875190): GATT is assumed supported. GATT starting triggers hardware

                    // initializtion. Configuring a device without GATT causes start up failures.

                    // initialization. Configuring a device without GATT causes start up failures.

                    if (GattService.class.getSimpleName().equals(profile.getName())) {

                        mNativeInterface.enable();

                    } else if (mRegisteredProfiles.size() == Config.getSupportedProfiles().length
@@ -618,28 +618,60 @@ public class AdapterService extends Service { 
            })

    public void onCreate() {

        super.onCreate();

        debugLog("onCreate()");

        if (!Flags.fastBindToApp()) {

            init();

            return;

        }

        // OnCreate must perform the minimum of infaillible and mandatory initialization

        if (mLooper == null) {

            mLooper = Looper.getMainLooper();

        }

        mHandler = new AdapterServiceHandler(mLooper);

        mAdapterProperties = new AdapterProperties(this);

        mAdapterStateMachine = new AdapterState(this, mLooper);

        mBinder = new AdapterServiceBinder(this);

        mUserManager = getNonNullSystemService(UserManager.class);

        mAppOps = getNonNullSystemService(AppOpsManager.class);

        mPowerManager = getNonNullSystemService(PowerManager.class);

        mBatteryStatsManager = getNonNullSystemService(BatteryStatsManager.class);

        mCompanionDeviceManager = getNonNullSystemService(CompanionDeviceManager.class);

    }



    private void init() {

        debugLog("init()");

        Config.init(this);

        if (!Flags.fastBindToApp()) {

            // Moved to OnCreate

            if (mLooper == null) {

                mLooper = Looper.getMainLooper();

            }

            mHandler = new AdapterServiceHandler(mLooper);

        }

        initMetricsLogger();

        debugLog("onCreate()");

        mDeviceConfigListener.start();



        if (!Flags.fastBindToApp()) {

            // Moved to OnCreate

            mUserManager = getNonNullSystemService(UserManager.class);

            mAppOps = getNonNullSystemService(AppOpsManager.class);

            mPowerManager = getNonNullSystemService(PowerManager.class);

            mBatteryStatsManager = getNonNullSystemService(BatteryStatsManager.class);

            mCompanionDeviceManager = getNonNullSystemService(CompanionDeviceManager.class);

        }



        mRemoteDevices = new RemoteDevices(this, mLooper);

        mRemoteDevices.init();

        clearDiscoveringPackages();

        if (!Flags.fastBindToApp()) {

            mBinder = new AdapterServiceBinder(this);

        }

        mAdapter = BluetoothAdapter.getDefaultAdapter();

        if (!Flags.fastBindToApp()) {

            // Moved to OnCreate

            mAdapterProperties = new AdapterProperties(this);

            mAdapterStateMachine = new AdapterState(this, mLooper);

        }

        mBluetoothKeystoreService =

                new BluetoothKeystoreService(

                        BluetoothKeystoreNativeInterface.getInstance(), isCommonCriteriaMode());
@@ -664,11 +696,6 @@ public class AdapterService extends Service { 
                isAtvDevice,

                getApplicationInfo().dataDir);

        mNativeAvailable = true;

        mPreferredAudioProfilesCallbacks =

                new RemoteCallbackList<IBluetoothPreferredAudioProfilesCallback>();

        mBluetoothQualityReportReadyCallbacks =

                new RemoteCallbackList<IBluetoothQualityReportReadyCallback>();

        mRemoteCallbacks = new RemoteCallbackList<IBluetoothCallback>();

        // Load the name and address

        mNativeInterface.getAdapterProperty(AbstractionLayer.BT_PROPERTY_BDADDR);

        mNativeInterface.getAdapterProperty(AbstractionLayer.BT_PROPERTY_BDNAME);
@@ -1103,7 +1130,7 @@ public class AdapterService extends Service { 
        mAdapterProperties.setState(newState);

        invalidateBluetoothGetStateCache();



        if (mRemoteCallbacks != null) {

        // Only BluetoothManagerService should be registered

        int n = mRemoteCallbacks.beginBroadcast();

        debugLog(

                "updateAdapterState() - Broadcasting state "
@@ -1121,7 +1148,6 @@ public class AdapterService extends Service { 
            }

        }

        mRemoteCallbacks.finishBroadcast();

        }



        for (Map.Entry<BluetoothStateCallback, Executor> e : mLocalCallbacks.entrySet()) {

            e.getValue().execute(() -> e.getKey().onBluetoothStateChange(prevState, newState));
@@ -1243,7 +1269,6 @@ public class AdapterService extends Service { 
    public int bluetoothQualityReportReadyCallback(

            BluetoothDevice device, BluetoothQualityReport bluetoothQualityReport) {

        synchronized (mBluetoothQualityReportReadyCallbacks) {

            if (mBluetoothQualityReportReadyCallbacks != null) {

            int n = mBluetoothQualityReportReadyCallbacks.beginBroadcast();

            debugLog(

                    "bluetoothQualityReportReadyCallback() - "
@@ -1269,7 +1294,6 @@ public class AdapterService extends Service { 
            }

            mBluetoothQualityReportReadyCallbacks.finishBroadcast();

        }

        }



        return BluetoothStatusCodes.SUCCESS;

    }
@@ -1406,18 +1430,12 @@ public class AdapterService extends Service { 
            mBinder = null; // Do not remove. Otherwise Binder leak!

        }



        if (mPreferredAudioProfilesCallbacks != null) {

        mPreferredAudioProfilesCallbacks.kill();

        }



        if (mBluetoothQualityReportReadyCallbacks != null) {

        mBluetoothQualityReportReadyCallbacks.kill();

        }



        if (mRemoteCallbacks != null) {

        mRemoteCallbacks.kill();

    }

    }



    private void invalidateBluetoothCaches() {

        BluetoothAdapter.invalidateGetProfileConnectionStateCache();
@@ -4266,7 +4284,6 @@ public class AdapterService extends Service { 
        private void unregisterCallback(IBluetoothCallback callback, AttributionSource source) {

            AdapterService service = getService();

            if (service == null

                    || service.mRemoteCallbacks == null

                    || !callerIsSystemOrActiveOrManagedUser(service, TAG, "unregisterCallback")

                    || !Utils.checkConnectPermissionForDataDelivery(service, source, TAG)) {

                return;
@@ -5849,10 +5866,6 @@ public class AdapterService extends Service { 


    private void sendPreferredAudioProfilesCallbackToApps(

            BluetoothDevice device, Bundle preferredAudioProfiles, int status) {

        if (mPreferredAudioProfilesCallbacks == null) {

            return;

        }



        int n = mPreferredAudioProfilesCallbacks.beginBroadcast();

        debugLog(

                "sendPreferredAudioProfilesCallbackToApps() - Broadcasting audio profile "
@@ -5901,6 +5914,10 @@ public class AdapterService extends Service { 
            debugLog("enable() called when Bluetooth was disallowed");

            return false;

        }

        if (Flags.fastBindToApp()) {

            // The call to init must be done on the main thread

            mHandler.post(() -> init());

        }



        debugLog("enable() - Enable called with quiet mode status =  " + quietMode);

        mQuietmode = quietMode;

flags/system_service.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -22,6 +22,13 @@ flag { 
    bug: "321804999"

}



flag {

    name: "fast_bind_to_app"

    namespace: "bluetooth"

    description: "Remove complexity and non necessary initialization when simply binding"

    bug: "328698375"

}



flag {

    name: "use_new_airplane_mode"

    namespace: "bluetooth"

service/src/com/android/server/bluetooth/BluetoothManagerService.java

+6 −1
Original line number Diff line number Diff line
@@ -1810,7 +1810,9 @@ class BluetoothManagerService { 
                            Log.e(TAG, "Unable to register BluetoothCallback", e);

                        }

                        // Inform BluetoothAdapter instances that service is up

                        if (!Flags.fastBindToApp()) {

                            sendBluetoothServiceUpCallback();

                        }



                        // Get the supported profiles list

                        try {
@@ -1828,6 +1830,9 @@ class BluetoothManagerService { 
                        } catch (RemoteException | TimeoutException e) {

                            Log.e(TAG, "Unable to call enable()", e);

                        }

                        if (Flags.fastBindToApp()) {

                            sendBluetoothServiceUpCallback();

                        }

                    } finally {

                        mAdapterLock.writeLock().unlock();

                    }