Merge "Schematize Car system properties"

2 files changed, 9 insertions, 9 deletions

diff --git a/car-lib/src/android/car/user/CarUserManagerHelper.java b/car-lib/src/android/car/user/CarUserManagerHelper.java
index ce509436c3..29535fc8e9 100644
--- a/car-lib/src/android/car/user/CarUserManagerHelper.java
+++ b/car-lib/src/android/car/user/CarUserManagerHelper.java
@@ -29,10 +29,10 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
+import android.sysprop.CarProperties;
 import android.util.Log;
 
 import com.android.internal.util.UserIcons;
@@ -56,7 +56,6 @@ import java.util.Set;
  */
 public class CarUserManagerHelper {
     private static final String TAG = "CarUserManagerHelper";
-    private static final String HEADLESS_SYSTEM_USER = "android.car.systemuser.headless";
     /**
      * Default set of restrictions for Non-Admin users.
      */
@@ -247,7 +246,7 @@ public class CarUserManagerHelper {
      * @return {@boolean true} if headless system user.
      */
     public boolean isHeadlessSystemUser() {
-        return SystemProperties.getBoolean(HEADLESS_SYSTEM_USER, false);
+        return CarProperties.headless_system_user().orElse(false);
     }
 
     /**
diff --git a/tests/carservice_unit_test/src/com/android/car/CarUserManagerHelperTest.java b/tests/carservice_unit_test/src/com/android/car/CarUserManagerHelperTest.java
index 7f53da5655..5ec5f0831f 100644
--- a/tests/carservice_unit_test/src/com/android/car/CarUserManagerHelperTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/CarUserManagerHelperTest.java
@@ -42,6 +42,7 @@ import android.os.UserManager;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
+import android.sysprop.CarProperties;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -106,7 +107,7 @@ public class CarUserManagerHelperTest {
 
         // Restore the non-headless state before every test. Individual tests can set the property
         // to true to test the headless system user scenario.
-        SystemProperties.set("android.car.systemuser.headless", "false");
+        CarProperties.headless_system_user(false);
     }
 
     @Test
@@ -123,7 +124,7 @@ public class CarUserManagerHelperTest {
     // System user will not be returned when calling get all users.
     @Test
     public void testHeadlessUser0GetAllUsers_NotReturnSystemUser() {
-        SystemProperties.set("android.car.systemuser.headless", "true");
+        CarProperties.headless_system_user(true);
         UserInfo otherUser1 = createUserInfoForId(10);
         UserInfo otherUser2 = createUserInfoForId(11);
         UserInfo otherUser3 = createUserInfoForId(12);
@@ -271,7 +272,7 @@ public class CarUserManagerHelperTest {
         assertThat(mCarUserManagerHelper.getMaxSupportedUsers()).isEqualTo(11);
 
         // In headless user 0 model, we want to exclude the system user.
-        SystemProperties.set("android.car.systemuser.headless", "true");
+        CarProperties.headless_system_user(true);
         assertThat(mCarUserManagerHelper.getMaxSupportedUsers()).isEqualTo(10);
     }
 
@@ -315,7 +316,7 @@ public class CarUserManagerHelperTest {
 
     @Test
     public void testHeadlessSystemUser_IsUserLimitReached() {
-        SystemProperties.set("android.car.systemuser.headless", "true");
+        CarProperties.headless_system_user(true);
         UserInfo user1 = createUserInfoForId(10);
         UserInfo user2 =
                 new UserInfo(/* id= */ 11, /* name = */ "user11", UserInfo.FLAG_MANAGED_PROFILE);
@@ -743,7 +744,7 @@ public class CarUserManagerHelperTest {
 
     @Test
     public void testGetInitialUserWithValidLastActiveUser() {
-        SystemProperties.set("android.car.systemuser.headless", "true");
+        CarProperties.headless_system_user(true);
         int lastActiveUserId = 12;
 
         UserInfo otherUser1 = createUserInfoForId(lastActiveUserId - 2);
@@ -759,7 +760,7 @@ public class CarUserManagerHelperTest {
 
     @Test
     public void testGetInitialUserWithNonExistLastActiveUser() {
-        SystemProperties.set("android.car.systemuser.headless", "true");
+        CarProperties.headless_system_user(true);
         int lastActiveUserId = 12;
 
         UserInfo otherUser1 = createUserInfoForId(lastActiveUserId - 2);