Merge "Avoid using resources in injector for color fade config" into main (fa5b10a1) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/DisplayPowerController2.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -613,7 +613,9 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal

		setUpAutoBrightness(resources, handler);

		mColorFadeEnabled = mInjector.isColorFadeEnabled(resources);
		mColorFadeEnabled = mInjector.isColorFadeEnabled()
		&& !resources.getBoolean(
		com.android.internal.R.bool.config_displayColorFadeDisabled);
		mColorFadeFadesConfig = resources.getBoolean(
		R.bool.config_animateScreenLights);

		@@ -3005,10 +3007,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
		sensorManager, resources);
		}

		boolean isColorFadeEnabled(Resources resources) {
		return !ActivityManager.isLowRamDeviceStatic()
		&& !resources.getBoolean(
		com.android.internal.R.bool.config_displayColorFadeDisabled);
		boolean isColorFadeEnabled() {
		return !ActivityManager.isLowRamDeviceStatic();
		}
		}