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

Commit 84fb08e3 authored by William Escande's avatar William Escande
Browse files

SystemServer: re-apply format on managerService 

Bug: 323060869
Bug: 316946334
Test: m Bluetooth | format change is no-op
Change-Id: I72379c9ab56681d63c13eaa589724a6002ce418c
parent 2a510930

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

+12 −14
Original line number Diff line number Diff line
@@ -129,20 +129,20 @@ class BluetoothManagerService { 
    }



    // Maximum msec to wait for service restart

    private static final int SERVICE_RESTART_TIME_MS

        = 400 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1);

    private static final int SERVICE_RESTART_TIME_MS =

            400 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1);

    // Maximum msec to wait for restart due to error

    private static final int ERROR_RESTART_TIME_MS

        = 3000 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1);

    private static final int ERROR_RESTART_TIME_MS =

            3000 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1);

    // Maximum msec to delay MESSAGE_USER_SWITCHED

    private static final int USER_SWITCHED_TIME_MS

        = 200 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1);

    private static final int USER_SWITCHED_TIME_MS =

            200 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1);

    // Delay for the addProxy function in msec

    private static final int ADD_PROXY_DELAY_MS

        = 100 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1);

    private static final int ADD_PROXY_DELAY_MS =

            100 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1);

    // Delay for retrying enable and disable in msec

    private static final int ENABLE_DISABLE_DELAY_MS

        = 300 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1);

    private static final int ENABLE_DISABLE_DELAY_MS =

            300 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1);



    @VisibleForTesting static final int MESSAGE_ENABLE = 1;

    @VisibleForTesting static final int MESSAGE_DISABLE = 2;
@@ -652,7 +652,6 @@ class BluetoothManagerService { 
        mBinder = new BluetoothServiceBinder(this, mLooper, mContext, mUserManager);

        mHandler = new BluetoothHandler(mLooper);





        // Observe BLE scan only mode settings change.

        registerForBleScanModeChange();
@@ -1041,7 +1040,6 @@ class BluetoothManagerService { 
            return false;

        }





        // TODO(b/262605980): enableBle/disableBle should be on handler thread

        updateBleAppCount(token, true, packageName);