From 9403bdeb2be74a07ad77c05a3492cd91b79dcbf4 Mon Sep 17 00:00:00 2001 From: Ying Zheng Date: Wed, 10 Apr 2019 16:34:54 -0700 Subject: [PATCH] Migrate to the new ro property for headless multiuser check. Test: build Bug: 129549399 Change-Id: I42ab7daa80da62e3d754e61721b5d7297f376419 --- .../core/java/com/android/server/BluetoothService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/BluetoothService.java b/services/core/java/com/android/server/BluetoothService.java index 6018f008054c3..5c5b477352b1f 100644 --- a/services/core/java/com/android/server/BluetoothService.java +++ b/services/core/java/com/android/server/BluetoothService.java @@ -18,11 +18,10 @@ package com.android.server; import android.bluetooth.BluetoothAdapter; import android.content.Context; -import android.os.SystemProperties; + +import com.android.internal.os.RoSystemProperties; class BluetoothService extends SystemService { - private static final String HEADLESS_SYSTEM_USER = "android.car.systemuser.headless"; - 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(); } }