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

Commit b0fa765e authored by William Escande's avatar William Escande
Browse files

SystemServer: remove fast_bind_to_app 

Bug: 328698375
Flag: com.android.bluetooth.flags.fast_bind_to_app
Test: m . | any test that turn on & off the Bluetooth
Change-Id: I511123324f8eedbbe8ddcb886d6fc94e0d17775e
parent 20decc93

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

+3 −34
Original line number Diff line number Diff line
@@ -629,10 +629,6 @@ public class AdapterService extends Service { 
    public void onCreate() {

        super.onCreate();

        Log.d(TAG, "onCreate()");

        if (!Flags.fastBindToApp()) {

            init();

            return;

        }

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

        mRemoteDevices = new RemoteDevices(this, mLooper);

        mAdapterProperties = new AdapterProperties(this, mRemoteDevices, mLooper);
@@ -652,27 +648,10 @@ public class AdapterService extends Service { 
        Config.init(this);

        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);

        }

        MetricsLogger.getInstance().init(this, mRemoteDevices);



        clearDiscoveringPackages();

        if (!Flags.fastBindToApp()) {

            mBinder = new AdapterServiceBinder(this);

        }

        mAdapter = BluetoothAdapter.getDefaultAdapter();

        if (!Flags.fastBindToApp()) {

            // Moved to OnCreate

            mAdapterProperties = new AdapterProperties(this, mRemoteDevices, mLooper);

            mAdapterStateMachine = new AdapterState(this, mLooper);

        }

        boolean isCommonCriteriaMode =

                getNonNullSystemService(DevicePolicyManager.class)

                        .isCommonCriteriaModeEnabled(null);
@@ -719,11 +698,7 @@ public class AdapterService extends Service { 
                        "BluetoothQualityReportNativeInterface cannot be null when BQR starts");

        mBluetoothQualityReportNativeInterface.init();



        if (Flags.fastBindToApp()) {

        mSdpManager = new SdpManager(this, mLooper);

        } else {

            mSdpManager = new SdpManager(this);

        }



        mDatabaseManager.start(MetadataDatabase.createDatabase(this));
@@ -765,10 +740,6 @@ public class AdapterService extends Service { 
                            mNativeInterface, mLooper, getSystemService(DisplayManager.class));

        }



        if (!Flags.fastBindToApp()) {

            setAdapterService(this);

        }



        invalidateBluetoothCaches();



        // First call to getSharedPreferences will result in a file read into
@@ -4683,10 +4654,8 @@ public class AdapterService extends Service { 
            Log.d(TAG, "offToBleOn() called when Bluetooth was disallowed");

            return;

        }

        if (Flags.fastBindToApp()) {

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

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

        }



        Log.i(TAG, "offToBleOn() - Enable called with quiet mode status =  " + quietMode);

        mQuietmode = quietMode;

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java

+2 −6
Original line number Diff line number Diff line
@@ -410,9 +410,7 @@ public class AdapterServiceTest { 
            IBluetoothCallback callback,

            AdapterNativeInterface nativeInterface) {

        adapter.offToBleOn(false);

        if (Flags.fastBindToApp()) {

            TestUtils.syncHandler(looper, 0); // when fastBindToApp is enable init need to be run

        }

        TestUtils.syncHandler(looper, 0); // `init` need to be run first

        TestUtils.syncHandler(looper, AdapterState.BLE_TURN_ON);

        verifyStateChange(callback, STATE_OFF, STATE_BLE_TURNING_ON);
@@ -625,9 +623,7 @@ public class AdapterServiceTest { 
        assertThat(mAdapterService.getState()).isEqualTo(STATE_OFF);



        mAdapterService.offToBleOn(false);

        if (Flags.fastBindToApp()) {

            syncHandler(0); // when fastBindToApp is enable init need to be run

        }

        syncHandler(0); // `init` need to be run first

        syncHandler(AdapterState.BLE_TURN_ON);

        verifyStateChange(STATE_OFF, STATE_BLE_TURNING_ON);

        assertThat(mAdapterService.getBluetoothGatt()).isNotNull();

flags/system_service.aconfig

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

}



flag {

    name: "fast_bind_to_app"

    namespace: "bluetooth"

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

    bug: "328698375"

}



flag {

    name: "get_state_from_system_server"

    namespace: "bluetooth"

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

+1 −12
Original line number Diff line number Diff line
@@ -1570,23 +1570,15 @@ class BluetoothManagerService { 
                        }

                    }



                    // Register callback object

                    try {

                        mAdapter.registerCallback(

                                mBluetoothCallback, mContext.getAttributionSource());

                    } catch (RemoteException e) {

                        Log.e(TAG, "Unable to register BluetoothCallback", e);

                    }

                    // Inform BluetoothAdapter instances that service is up

                    if (!Flags.fastBindToApp()) {

                        sendBluetoothServiceUpCallback();

                    }



                    // Do enable request

                    offToBleOn();

                    if (Flags.fastBindToApp()) {

                    sendBluetoothServiceUpCallback();

                    }



                    if (!mEnable) {

                        waitForState(STATE_ON);
@@ -1892,9 +1884,6 @@ class BluetoothManagerService { 
    private void handleEnable() {

        if (mAdapter == null && !isBinding()) {

            bindToAdapter();

        } else if (!Flags.fastBindToApp() && mAdapter != null) {

            // Enable bluetooth

            offToBleOn();

        }

    }