OSDN Git Service

Migrate to the new ro property for headless multiuser check.
authorYing Zheng <yizheng@google.com>
Wed, 10 Apr 2019 23:34:54 +0000 (16:34 -0700)
committerYing Zheng <yizheng@google.com>
Wed, 10 Apr 2019 23:38:22 +0000 (16:38 -0700)
Test: build
Bug: 129549399
Change-Id: I42ab7daa80da62e3d754e61721b5d7297f376419

services/core/java/com/android/server/BluetoothService.java

index 6018f00..5c5b477 100644 (file)
@@ -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();
         }
     }