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

Commit a3febe87 authored by Inseob Kim's avatar Inseob Kim Committed by android-build-merger
Browse files

Merge changes from topic "schematize_car_props" am: b5278998 

am: e9f3d2e8

Change-Id: Ie302f69585892ea1465d9f4fce1b9699c8168f2c
parents c8dad020 e9f3d2e8

packages/SettingsLib/src/com/android/settingslib/users/UserManagerHelper.java

+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);

    }



    /**

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

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