Merge "Adding support for strategy name in the BrightnessEvent" (8386283b) · Commits · e / os / android_frameworks_base

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

+36 −0

Original line number	Diff line number	Diff line
		@@ -28,11 +28,13 @@ public final class DisplayBrightnessState {
		private final float mBrightness;
		private final float mSdrBrightness;
		private final BrightnessReason mBrightnessReason;
		private final String mDisplayBrightnessStrategyName;

		private DisplayBrightnessState(Builder builder) {
		this.mBrightness = builder.getBrightness();
		this.mSdrBrightness = builder.getSdrBrightness();
		this.mBrightnessReason = builder.getBrightnessReason();
		this.mDisplayBrightnessStrategyName = builder.getDisplayBrightnessStrategyName();
		}

		/**
		@@ -56,6 +58,14 @@ public final class DisplayBrightnessState {
		return mBrightnessReason;
		}

		/**
		* Gets the {@link com.android.server.display.brightness.strategy.DisplayBrightnessStrategy}
		* name
		*/
		public String getDisplayBrightnessStrategyName() {
		return mDisplayBrightnessStrategyName;
		}

		@Override
		public String toString() {
		StringBuilder stringBuilder = new StringBuilder("DisplayBrightnessState:");
		@@ -93,6 +103,10 @@ public final class DisplayBrightnessState {
		if (!mBrightnessReason.equals(displayBrightnessState.getBrightnessReason())) {
		return false;
		}
		if (!mDisplayBrightnessStrategyName.equals(
		displayBrightnessState.getDisplayBrightnessStrategyName())) {
		return false;
		}
		return true;
		}

		@@ -108,6 +122,7 @@ public final class DisplayBrightnessState {
		private float mBrightness;
		private float mSdrBrightness;
		private BrightnessReason mBrightnessReason = new BrightnessReason();
		private String mDisplayBrightnessStrategyName;

		/**
		* Gets the brightness
		@@ -163,6 +178,27 @@ public final class DisplayBrightnessState {
		return this;
		}

		/**
		* Gets the {@link com.android.server.display.brightness.strategy.DisplayBrightnessStrategy}
		* name
		*/
		public String getDisplayBrightnessStrategyName() {
		return mDisplayBrightnessStrategyName;
		}

		/**
		* Sets the
		* {@link com.android.server.display.brightness.strategy.DisplayBrightnessStrategy}'s name
		*
		* @param displayBrightnessStrategyName The name of the
		* {@link com.android.server.display.brightness.strategy.DisplayBrightnessStrategy} being
		* used.
		*/
		public Builder setDisplayBrightnessStrategyName(String displayBrightnessStrategyName) {
		this.mDisplayBrightnessStrategyName = displayBrightnessStrategyName;
		return this;
		}

		/**
		* This is used to construct an immutable DisplayBrightnessState object from its builder
		*/

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -1548,6 +1548,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
		? mCdsi.getReduceBrightColorsStrength() : -1);
		mTempBrightnessEvent.setPowerFactor(mPowerRequest.screenLowPowerBrightnessFactor);
		mTempBrightnessEvent.setWasShortTermModelActive(hadUserBrightnessPoint);
		mTempBrightnessEvent.setDisplayBrightnessStrategyName(displayBrightnessState
		.getDisplayBrightnessStrategyName());
		// Temporary is what we use during slider interactions. We avoid logging those so that
		// we don't spam logcat when the slider is being used.
		boolean tempToTempTransition =

services/core/java/com/android/server/display/brightness/BrightnessEvent.java

+15 −2

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ public final class BrightnessEvent {
		private int mFlags;
		private int mAdjustmentFlags;
		private boolean mAutomaticBrightnessEnabled;
		private String mDisplayBrightnessStrategyName;

		public BrightnessEvent(BrightnessEvent that) {
		copyFrom(that);
		@@ -92,6 +93,7 @@ public final class BrightnessEvent {
		mAdjustmentFlags = that.getAdjustmentFlags();
		// Auto-brightness setting
		mAutomaticBrightnessEnabled = that.isAutomaticBrightnessEnabled();
		mDisplayBrightnessStrategyName = that.getDisplayBrightnessStrategyName();
		}

		/**
		@@ -120,6 +122,7 @@ public final class BrightnessEvent {
		mAdjustmentFlags = 0;
		// Auto-brightness setting
		mAutomaticBrightnessEnabled = true;
		mDisplayBrightnessStrategyName = "";
		}

		/**
		@@ -157,7 +160,8 @@ public final class BrightnessEvent {
		&& mWasShortTermModelActive == that.mWasShortTermModelActive
		&& mFlags == that.mFlags
		&& mAdjustmentFlags == that.mAdjustmentFlags
		&& mAutomaticBrightnessEnabled == that.mAutomaticBrightnessEnabled;
		&& mAutomaticBrightnessEnabled == that.mAutomaticBrightnessEnabled
		&& mDisplayBrightnessStrategyName.equals(that.mDisplayBrightnessStrategyName);
		}

		/**
		@@ -185,7 +189,8 @@ public final class BrightnessEvent {
		+ ", wasShortTermModelActive=" + mWasShortTermModelActive
		+ ", flags=" + flagsToString()
		+ ", reason=" + mReason.toString(mAdjustmentFlags)
		+ ", autoBrightness=" + mAutomaticBrightnessEnabled;
		+ ", autoBrightness=" + mAutomaticBrightnessEnabled
		+ ", strategy=" + mDisplayBrightnessStrategyName;
		}

		@Override
		@@ -355,6 +360,14 @@ public final class BrightnessEvent {
		return mAutomaticBrightnessEnabled;
		}

		public void setDisplayBrightnessStrategyName(String displayBrightnessStrategyName) {
		mDisplayBrightnessStrategyName = displayBrightnessStrategyName;
		}

		public String getDisplayBrightnessStrategyName() {
		return mDisplayBrightnessStrategyName;
		}

		public void setAutomaticBrightnessEnabled(boolean mAutomaticBrightnessEnabled) {
		this.mAutomaticBrightnessEnabled = mAutomaticBrightnessEnabled;
		}

services/core/java/com/android/server/display/brightness/BrightnessUtils.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -45,13 +45,15 @@ public final class BrightnessUtils {
		* A utility to construct the DisplayBrightnessState
		*/
		public static DisplayBrightnessState constructDisplayBrightnessState(
		int brightnessChangeReason, float brightness, float sdrBrightness) {
		int brightnessChangeReason, float brightness, float sdrBrightness,
		String displayBrightnessStrategyName) {
		BrightnessReason brightnessReason = new BrightnessReason();
		brightnessReason.setReason(brightnessChangeReason);
		return new DisplayBrightnessState.Builder()
		.setBrightness(brightness)
		.setSdrBrightness(sdrBrightness)
		.setBrightnessReason(brightnessReason)
		.setDisplayBrightnessStrategyName(displayBrightnessStrategyName)
		.build();
		}
		}

services/core/java/com/android/server/display/brightness/strategy/BoostBrightnessStrategy.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ public class BoostBrightnessStrategy implements DisplayBrightnessStrategy {
		DisplayBrightnessState displayBrightnessState =
		BrightnessUtils.constructDisplayBrightnessState(BrightnessReason.REASON_BOOST,
		PowerManager.BRIGHTNESS_MAX,
		PowerManager.BRIGHTNESS_MAX);
		PowerManager.BRIGHTNESS_MAX, getName());
		return displayBrightnessState;
		}