From f9194ebacd8cdc3d0302b61f89a4c16e116ae834 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Wed, 21 Nov 2018 13:39:11 +0900 Subject: [PATCH 1/2] Schematize Car system properties Properties accessed across partitions are now schematized and will become APIs to make explicit interfaces among partitions. Bug: 117924132 Test: mma -j Change-Id: I203861a78f48529434595c2e923c03d58b7e8299 Merged-In: I203861a78f48529434595c2e923c03d58b7e8299 --- .../src/com/android/systemui/statusbar/car/CarStatusBar.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java index 83021ca51a558..be46d2c7e4aed 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java @@ -19,7 +19,7 @@ package com.android.systemui.statusbar.car; import android.app.ActivityManager; import android.graphics.PixelFormat; import android.graphics.drawable.Drawable; -import android.os.SystemProperties; +import android.sysprop.CarProperties; import android.util.Log; import android.view.Gravity; import android.view.View; @@ -56,7 +56,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.BatteryViewHandler { private static final String TAG = "CarStatusBar"; public static final boolean ENABLE_HVAC_CONNECTION - = !SystemProperties.getBoolean("android.car.hvac.demo", true); + = !CarProperties.hvac_demo().orElse(true); private TaskStackListenerImpl mTaskStackListener; From ae3056f444b72a7199bbaf4c53dfb249c1d4b76c Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Wed, 21 Nov 2018 13:39:11 +0900 Subject: [PATCH 2/2] Fix missing schematized Car system properties Properties accessed across partitions are now schematized and will become APIs to make explicit interfaces among partitions. Bug: 117924132 Test: mma -j Change-Id: Ib698d64d93a7bf4c1d9b7d8b883009b8de65ed09 --- .../src/com/android/settingslib/users/UserManagerHelper.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/users/UserManagerHelper.java b/packages/SettingsLib/src/com/android/settingslib/users/UserManagerHelper.java index 4c45a75d876a2..cb2a088f738b5 100644 --- a/packages/SettingsLib/src/com/android/settingslib/users/UserManagerHelper.java +++ b/packages/SettingsLib/src/com/android/settingslib/users/UserManagerHelper.java @@ -25,9 +25,9 @@ import android.content.pm.UserInfo; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; +import android.sysprop.CarProperties; import android.util.Log; import com.android.internal.util.UserIcons; @@ -43,7 +43,6 @@ import java.util.List; @Deprecated public final class UserManagerHelper { private static final String TAG = "UserManagerHelper"; - private static final String HEADLESS_SYSTEM_USER = "android.car.systemuser.headless"; private final Context mContext; private final UserManager mUserManager; private final ActivityManager mActivityManager; @@ -84,7 +83,7 @@ public final class UserManagerHelper { * @return {@boolean true} if headless system user. */ public boolean isHeadlessSystemUser() { - return SystemProperties.getBoolean(HEADLESS_SYSTEM_USER, false); + return CarProperties.headless_system_user().orElse(false); } /**