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

Commit 146885a0 authored by Hsin-chen Chuang's avatar Hsin-chen Chuang Committed by Automerger Merge Worker
Browse files

Merge "BluetoothService: Init Bluetooth if config_bootToHeadlessSystemUser"... 

Merge "BluetoothService: Init Bluetooth if config_bootToHeadlessSystemUser" into main am: 4e9519ff am: d408bf9f

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



Change-Id: I041f42286e751b21393509d3ee402eb15d2d991a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 55a35d2c d408bf9f

service/src/BluetoothService.kt

+9 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.server.bluetooth 


import android.bluetooth.BluetoothAdapter

import android.content.Context

import android.content.res.Resources

import android.os.HandlerThread

import android.os.UserManager

import com.android.server.SystemService
@@ -52,7 +53,14 @@ class BluetoothService(context: Context) : SystemService(context) { 
    }



    override fun onUserStarting(user: TargetUser) {

        if (!UserManager.isHeadlessSystemUserMode()) {

        if (

            !UserManager.isHeadlessSystemUserMode() ||

                Resources.getSystem()

                    .getBoolean(

                        Resources.getSystem()

                            .getIdentifier("config_bootToHeadlessSystemUser", "bool", "android")

                    )

        ) {

            initialize(user)

        }

    }