Snap for 12148957 from 5eb18ea6cf2dcf5084693bbd785fccc20f607eeb to 24Q4-release (f44881c3) · Commits · e / os / android_frameworks_base

core/java/android/os/BatteryConsumer.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -209,7 +209,8 @@ public abstract class BatteryConsumer {
		POWER_COMPONENT_VIDEO,
		POWER_COMPONENT_FLASHLIGHT,
		POWER_COMPONENT_CAMERA,
		POWER_COMPONENT_GNSS};
		POWER_COMPONENT_GNSS,
		POWER_COMPONENT_SENSORS};
		Arrays.sort(supportedPowerComponents);
		SUPPORTED_POWER_COMPONENTS_PER_PROCESS_STATE = IntArray.wrap(supportedPowerComponents);
		};

core/java/android/os/BatteryStats.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -3077,7 +3077,7 @@ public abstract class BatteryStats {
		public static final String[] HISTORY_EVENT_NAMES = new String[] {
		"null", "proc", "fg", "top", "sync", "wake_lock_in", "job", "user", "userfg", "conn",
		"active", "pkginst", "pkgunin", "alarm", "stats", "pkginactive", "pkgactive",
		"tmpwhitelist", "screenwake", "wakeupap", "longwake", "est_capacity", "state"
		"tmpwhitelist", "screenwake", "wakeupap", "longwake", "state"
		};

		public static final String[] HISTORY_EVENT_CHECKIN_NAMES = new String[] {

core/java/android/service/dreams/DreamService.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -1346,7 +1346,11 @@ public class DreamService extends Service implements Window.Callback {
		Slog.w(mTag, "WakeUp was called before the dream was attached.");
		} else {
		try {
		if (startAndStopDozingInBackground()) {
		mDreamManager.finishSelfOneway(mDreamToken, false /immediate/);
		} else {
		mDreamManager.finishSelf(mDreamToken, false /immediate/);
		}
		} catch (RemoteException ex) {
		// system server died
		}
		@@ -1497,7 +1501,11 @@ public class DreamService extends Service implements Window.Callback {
		if (mFinished \|\| mWaking) {
		Slog.w(mTag, "attach() called after dream already finished");
		try {
		if (startAndStopDozingInBackground()) {
		mDreamManager.finishSelfOneway(dreamToken, true /immediate/);
		} else {
		mDreamManager.finishSelf(dreamToken, true /immediate/);
		}
		} catch (RemoteException ex) {
		// system server died
		}

core/java/com/android/internal/widget/remotecompose/core/Operations.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import com.android.internal.widget.remotecompose.core.operations.DrawTweenPath;
		import com.android.internal.widget.remotecompose.core.operations.FloatConstant;
		import com.android.internal.widget.remotecompose.core.operations.FloatExpression;
		import com.android.internal.widget.remotecompose.core.operations.Header;
		import com.android.internal.widget.remotecompose.core.operations.IntegerExpression;
		import com.android.internal.widget.remotecompose.core.operations.MatrixRestore;
		import com.android.internal.widget.remotecompose.core.operations.MatrixRotate;
		import com.android.internal.widget.remotecompose.core.operations.MatrixSave;
		@@ -54,6 +55,8 @@ import com.android.internal.widget.remotecompose.core.operations.TextFromFloat;
		import com.android.internal.widget.remotecompose.core.operations.TextMerge;
		import com.android.internal.widget.remotecompose.core.operations.Theme;
		import com.android.internal.widget.remotecompose.core.operations.utilities.IntMap;
		import com.android.internal.widget.remotecompose.core.types.BooleanConstant;
		import com.android.internal.widget.remotecompose.core.types.IntegerConstant;

		/**
		* List of operations supported in a RemoteCompose document
		@@ -109,6 +112,9 @@ public class Operations {
		public static final int TEXT_MERGE = 136;
		public static final int NAMED_VARIABLE = 137;
		public static final int COLOR_CONSTANT = 138;
		public static final int DATA_INT = 140;
		public static final int DATA_BOOLEAN = 143;
		public static final int INTEGER_EXPRESSION = 144;

		/////////////////////////////////////////======================
		public static IntMap<CompanionOperation> map = new IntMap<>();
		@@ -153,6 +159,9 @@ public class Operations {
		map.put(TEXT_MERGE, TextMerge.COMPANION);
		map.put(NAMED_VARIABLE, NamedVariable.COMPANION);
		map.put(COLOR_CONSTANT, ColorConstant.COMPANION);
		map.put(DATA_INT, IntegerConstant.COMPANION);
		map.put(INTEGER_EXPRESSION, IntegerExpression.COMPANION);
		map.put(DATA_BOOLEAN, BooleanConstant.COMPANION);
		}

		}

core/java/com/android/internal/widget/remotecompose/core/PaintContext.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,16 @@ public abstract class PaintContext {

		public abstract void drawRect(float left, float top, float right, float bottom);

		/**
		* this caches the paint to a paint stack
		*/
		public abstract void savePaint();

		/**
		* This restores the paint form the paint stack
		*/
		public abstract void restorePaint();

		public abstract void drawRoundRect(float left,
		float top,
		float right,
		@@ -119,6 +129,10 @@ public abstract class PaintContext {
		float start,
		float stop);

		/**
		* This applies changes to the current paint
		* @param mPaintData the list of changes
		*/
		public abstract void applyPaint(PaintBundle mPaintData);

		/**