summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ying Zheng <yizheng@google.com> 2019-04-10 16:34:54 -0700
committer Ying Zheng <yizheng@google.com> 2019-04-10 16:38:22 -0700
commit9403bdeb2be74a07ad77c05a3492cd91b79dcbf4 (patch)
tree9c5c741840bd6847c41891fa9ad60ec877ecf7d5
parent4214a0933d5f060970cbeae145566597aaa29e40 (diff)
Migrate to the new ro property for headless multiuser check.
Test: build Bug: 129549399 Change-Id: I42ab7daa80da62e3d754e61721b5d7297f376419
-rw-r--r--services/core/java/com/android/server/BluetoothService.java7
1 files 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 6018f008054c..5c5b477352b1 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;
-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();
}
}