Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "schematize_car_props"

Browse Source 
* changes:
  Fix missing schematized Car system properties
  Schematize Car system properties
This commit is contained in:
Treehugger Robot
2018-12-14 01:31:29 +00:00
committed by Gerrit Code Review
parent 97ee6295e9 ae3056f444
commit b5278998c7
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsLib/src/com/android/settingslib/users/UserManagerHelper.java
View File

@@ -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);
}
/**

4
packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
View File

@@ -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;