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

Merge "Remove display VR brightness clients"

Browse Source
This commit is contained in:
Rupesh Bansal
2022-12-09 13:35:13 +00:00
committed by Android (Google) Code Review
parent 4c3f1666b4 c4babe886d
commit 167ce476ba
10 changed files with 10 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
core/java/android/os/PowerManager.java
View File

@@ -533,10 +533,7 @@ public final class PowerManager {
BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM,
BRIGHTNESS_CONSTRAINT_TYPE_DEFAULT,
BRIGHTNESS_CONSTRAINT_TYPE_DIM,
BRIGHTNESS_CONSTRAINT_TYPE_DOZE,
BRIGHTNESS_CONSTRAINT_TYPE_MINIMUM_VR,
BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM_VR,
BRIGHTNESS_CONSTRAINT_TYPE_DEFAULT_VR
BRIGHTNESS_CONSTRAINT_TYPE_DOZE
})
@Retention(RetentionPolicy.SOURCE)
public @interface BrightnessConstraint{}
@@ -570,24 +567,6 @@ public final class PowerManager {
*/
public static final int BRIGHTNESS_CONSTRAINT_TYPE_DOZE = 4;
/**
* Brightness constraint type: minimum allowed value.
* @hide
*/
public static final int BRIGHTNESS_CONSTRAINT_TYPE_MINIMUM_VR = 5;
/**
* Brightness constraint type: minimum allowed value.
* @hide
*/
public static final int BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM_VR = 6;
/**
* Brightness constraint type: minimum allowed value.
* @hide
*/
public static final int BRIGHTNESS_CONSTRAINT_TYPE_DEFAULT_VR = 7;
/**
* @hide
*/
@@ -1210,35 +1189,6 @@ public final class PowerManager {
com.android.internal.R.integer.config_screenBrightnessSettingDefault);
}
/**
* Gets the minimum supported screen brightness setting for VR Mode.
* @hide
*/
public int getMinimumScreenBrightnessForVrSetting() {
return mContext.getResources().getInteger(
com.android.internal.R.integer.config_screenBrightnessForVrSettingMinimum);
}
/**
* Gets the maximum supported screen brightness setting for VR Mode.
* The screen may be allowed to become dimmer than this value but
* this is the maximum value that can be set by the user.
* @hide
*/
public int getMaximumScreenBrightnessForVrSetting() {
return mContext.getResources().getInteger(
com.android.internal.R.integer.config_screenBrightnessForVrSettingMaximum);
}
/**
* Gets the default screen brightness for VR setting.
* @hide
*/
public int getDefaultScreenBrightnessForVrSetting() {
return mContext.getResources().getInteger(
com.android.internal.R.integer.config_screenBrightnessForVrSettingDefault);
}
/**
* Gets a float screen brightness setting.
* @hide

17
core/java/android/provider/Settings.java
View File

@@ -4637,21 +4637,6 @@ public final class Settings {
@Readable
public static final String SCREEN_BRIGHTNESS = "screen_brightness";
/**
* The screen backlight brightness between 0 and 255.
* @hide
*/
@Readable
public static final String SCREEN_BRIGHTNESS_FOR_VR = "screen_brightness_for_vr";
/**
* The screen backlight brightness between 0.0f and 1.0f.
* @hide
*/
@Readable
public static final String SCREEN_BRIGHTNESS_FOR_VR_FLOAT =
"screen_brightness_for_vr_float";
/**
* The screen backlight brightness between 0.0f and 1.0f.
* @hide
@@ -5637,8 +5622,6 @@ public final class Settings {
PUBLIC_SETTINGS.add(SCREEN_OFF_TIMEOUT);
PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS);
PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS_FLOAT);
PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS_FOR_VR);
PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS_FOR_VR_FLOAT);
PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS_MODE);
PUBLIC_SETTINGS.add(MODE_RINGER_STREAMS_AFFECTED);
PUBLIC_SETTINGS.add(MUTE_STREAMS_AFFECTED);

24
core/res/res/values/config.xml
View File

@@ -1371,30 +1371,6 @@
Must be in the range specified by minimum and maximum. -->
<item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">-2</item>
<!-- Note: This setting is deprecated, please use
config_screenBrightnessSettingForVrDefaultFloat instead -->
<integer name="config_screenBrightnessForVrSettingDefault">86</integer>
<!-- Note: This setting is deprecated, please use
config_screenBrightnessSettingForVrMinimumFloat instead -->
<integer name="config_screenBrightnessForVrSettingMinimum">79</integer>
<!-- Note: This setting is deprecated, please use
config_screenBrightnessSettingForVrMaximumFloat instead -->
<integer name="config_screenBrightnessForVrSettingMaximum">255</integer>
<!-- Default screen brightness for VR setting as a float.
Equivalent to 86/255-->
<item name="config_screenBrightnessSettingForVrDefaultFloat" format="float" type="dimen">0.33464</item>
<!-- Minimum screen brightness setting allowed for VR. Device panels start increasing pulse
width as brightness decreases below this threshold as float.
Equivalent to 79/255 -->
<item name="config_screenBrightnessSettingForVrMinimumFloat" format="float" type="dimen">0.307087</item>
<!-- Maximum screen brightness setting allowed for VR as float. -->
<item name="config_screenBrightnessSettingForVrMaximumFloat" format="float" type="dimen">1.0</item>
<!-- Screen brightness used to dim the screen while dozing in a very low power state.
May be less than the minimum allowed brightness setting
that can be set by the user. -->

6
core/res/res/values/symbols.xml
View File

@@ -2062,12 +2062,6 @@
<java-symbol type="integer" name="config_screenBrightnessSettingMinimum" />
<java-symbol type="integer" name="config_screenBrightnessSettingMaximum" />
<java-symbol type="integer" name="config_screenBrightnessSettingDefault" />
<java-symbol type="integer" name="config_screenBrightnessForVrSettingDefault" />
<java-symbol type="integer" name="config_screenBrightnessForVrSettingMaximum" />
<java-symbol type="integer" name="config_screenBrightnessForVrSettingMinimum" />
<java-symbol type="dimen" name="config_screenBrightnessSettingForVrMinimumFloat" />
<java-symbol type="dimen" name="config_screenBrightnessSettingForVrMaximumFloat" />
<java-symbol type="dimen" name="config_screenBrightnessSettingForVrDefaultFloat" />
<java-symbol type="dimen" name="config_screenBrightnessSettingMinimumFloat" />
<java-symbol type="dimen" name="config_screenBrightnessSettingMaximumFloat" />
<java-symbol type="dimen" name="config_screenBrightnessSettingDefaultFloat" />

1
packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java
View File

@@ -111,7 +111,6 @@ public class SystemSettingsValidators {
});
VALIDATORS.put(System.DISPLAY_COLOR_MODE_VENDOR_HINT, ANY_STRING_VALIDATOR);
VALIDATORS.put(System.SCREEN_OFF_TIMEOUT, NON_NEGATIVE_INTEGER_VALIDATOR);
VALIDATORS.put(System.SCREEN_BRIGHTNESS_FOR_VR, new InclusiveIntegerRangeValidator(0, 255));
VALIDATORS.put(System.SCREEN_BRIGHTNESS_MODE, BOOLEAN_VALIDATOR);
VALIDATORS.put(System.ADAPTIVE_SLEEP, BOOLEAN_VALIDATOR);
VALIDATORS.put(System.MODE_RINGER_STREAMS_AFFECTED, NON_NEGATIVE_INTEGER_VALIDATOR);

4
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@@ -33,7 +33,6 @@ import android.media.AudioSystem;
import android.net.ConnectivityManager;
import android.os.Build;
import android.os.Environment;
import android.os.RemoteException;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.Settings;
@@ -2243,9 +2242,6 @@ class DatabaseHelper extends SQLiteOpenHelper {
loadIntegerSetting(stmt, Settings.System.SCREEN_BRIGHTNESS,
R.integer.def_screen_brightness);
loadIntegerSetting(stmt, Settings.System.SCREEN_BRIGHTNESS_FOR_VR,
com.android.internal.R.integer.config_screenBrightnessForVrSettingDefault);
loadBooleanSetting(stmt, Settings.System.SCREEN_BRIGHTNESS_MODE,
R.bool.def_screen_brightness_automatic_mode);

6
packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
View File

@@ -2840,9 +2840,6 @@ class SettingsProtoDumpUtil {
dumpSetting(s, p,
Settings.System.SCREEN_BRIGHTNESS,
SystemSettingsProto.Screen.BRIGHTNESS);
dumpSetting(s, p,
Settings.System.SCREEN_BRIGHTNESS_FOR_VR,
SystemSettingsProto.Screen.BRIGHTNESS_FOR_VR);
dumpSetting(s, p,
Settings.System.SCREEN_BRIGHTNESS_MODE,
SystemSettingsProto.Screen.BRIGHTNESS_MODE);
@@ -2852,9 +2849,6 @@ class SettingsProtoDumpUtil {
dumpSetting(s, p,
Settings.System.SCREEN_BRIGHTNESS_FLOAT,
SystemSettingsProto.Screen.BRIGHTNESS_FLOAT);
dumpSetting(s, p,
Settings.System.SCREEN_BRIGHTNESS_FOR_VR_FLOAT,
SystemSettingsProto.Screen.BRIGHTNESS_FOR_VR_FLOAT);
p.end(screenToken);
dumpSetting(s, p,

2
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -100,8 +100,6 @@ public class SettingsBackupTest {
Settings.System.MIN_REFRESH_RATE, // depends on hardware capabilities
Settings.System.PEAK_REFRESH_RATE, // depends on hardware capabilities
Settings.System.SCREEN_BRIGHTNESS_FLOAT,
Settings.System.SCREEN_BRIGHTNESS_FOR_VR,
Settings.System.SCREEN_BRIGHTNESS_FOR_VR_FLOAT,
Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ,
Settings.System.MULTI_AUDIO_FOCUS_ENABLED // form-factor/OEM specific
);

42
packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java
View File

@@ -67,11 +67,6 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig
private static final Uri BRIGHTNESS_MODE_URI =
Settings.System.getUriFor(Settings.System.SCREEN_BRIGHTNESS_MODE);
private static final Uri BRIGHTNESS_FOR_VR_FLOAT_URI =
Settings.System.getUriFor(Settings.System.SCREEN_BRIGHTNESS_FOR_VR_FLOAT);
private final float mMinimumBacklightForVr;
private final float mMaximumBacklightForVr;
private final int mDisplayId;
private final Context mContext;
@@ -126,8 +121,6 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig
if (BRIGHTNESS_MODE_URI.equals(uri)) {
mBackgroundHandler.post(mUpdateModeRunnable);
mBackgroundHandler.post(mUpdateSliderRunnable);
} else if (BRIGHTNESS_FOR_VR_FLOAT_URI.equals(uri)) {
mBackgroundHandler.post(mUpdateSliderRunnable);
} else {
mBackgroundHandler.post(mUpdateModeRunnable);
mBackgroundHandler.post(mUpdateSliderRunnable);
@@ -140,9 +133,6 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig
cr.registerContentObserver(
BRIGHTNESS_MODE_URI,
false, this, UserHandle.USER_ALL);
cr.registerContentObserver(
BRIGHTNESS_FOR_VR_FLOAT_URI,
false, this, UserHandle.USER_ALL);
mDisplayManager.registerDisplayListener(mDisplayListener, mHandler,
DisplayManager.EVENT_FLAG_DISPLAY_BRIGHTNESS);
}
@@ -304,10 +294,6 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig
mDisplayId = mContext.getDisplayId();
PowerManager pm = context.getSystemService(PowerManager.class);
mMinimumBacklightForVr = pm.getBrightnessConstraint(
PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MINIMUM_VR);
mMaximumBacklightForVr = pm.getBrightnessConstraint(
PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM_VR);
mDisplayManager = context.getSystemService(DisplayManager.class);
mVrManager = IVrManager.Stub.asInterface(ServiceManager.getService(
@@ -336,17 +322,12 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig
final float maxBacklight;
final int metric;
if (mIsVrModeEnabled) {
metric = MetricsEvent.ACTION_BRIGHTNESS_FOR_VR;
minBacklight = mMinimumBacklightForVr;
maxBacklight = mMaximumBacklightForVr;
} else {
metric = mAutomatic
? MetricsEvent.ACTION_BRIGHTNESS_AUTO
: MetricsEvent.ACTION_BRIGHTNESS;
minBacklight = mBrightnessMin;
maxBacklight = mBrightnessMax;
}
metric = mAutomatic
? MetricsEvent.ACTION_BRIGHTNESS_AUTO
: MetricsEvent.ACTION_BRIGHTNESS;
minBacklight = mBrightnessMin;
maxBacklight = mBrightnessMax;
final float valFloat = MathUtils.min(
convertGammaToLinearFloat(value, minBacklight, maxBacklight),
maxBacklight);
@@ -398,15 +379,8 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig
}
private void updateSlider(float brightnessValue, boolean inVrMode) {
final float min;
final float max;
if (inVrMode) {
min = mMinimumBacklightForVr;
max = mMaximumBacklightForVr;
} else {
min = mBrightnessMin;
max = mBrightnessMax;
}
final float min = mBrightnessMin;
final float max = mBrightnessMax;
// Ensure the slider is in a fixed position first, then check if we should animate.
if (mSliderAnimator != null && mSliderAnimator.isStarted()) {

2
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
View File

@@ -4310,7 +4310,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {
mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID;
setupDeviceOwner();
assertExpectException(SecurityException.class, null, () ->
dpm.setSystemSetting(admin1, Settings.System.SCREEN_BRIGHTNESS_FOR_VR, "0"));
dpm.setSystemSetting(admin1, Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, "0"));
}
@Test