Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5278998 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "schematize_car_props"

* changes:
  Fix missing schematized Car system properties
  Schematize Car system properties
parents 97ee6295 ae3056f4
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -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);
    }

    /**
+2 −2
Original line number Diff line number Diff line
@@ -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;