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

Commit 5b473fa5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Migrate to the new ro property for headless multiuser check." into qt-dev

parents 3aa97335 4aec3533

service/java/com/android/server/bluetooth/BluetoothService.java

+3 −4
Original line number Diff line number Diff line
@@ -18,11 +18,10 @@ package com.android.server; 


import android.bluetooth.BluetoothAdapter;

import android.content.Context;

import android.os.SystemProperties;



class BluetoothService extends SystemService {

    private static final String HEADLESS_SYSTEM_USER = "android.car.systemuser.headless";

import com.android.internal.os.RoSystemProperties;



class BluetoothService extends SystemService {

    private BluetoothManagerService mBluetoothManagerService;

    private boolean mInitialized = false;
@@ -48,7 +47,7 @@ class BluetoothService extends SystemService { 
            publishBinderService(BluetoothAdapter.BLUETOOTH_MANAGER_SERVICE,

                    mBluetoothManagerService);

        } else if (phase == SystemService.PHASE_ACTIVITY_MANAGER_READY &&

                !SystemProperties.getBoolean(HEADLESS_SYSTEM_USER, false)) {

                !RoSystemProperties.MULTIUSER_HEADLESS_SYSTEM_USER) {

            initialize();

        }

    }