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

Commit 575b1cd6 authored Apr 12, 2023 by Vova Sharaienko Committed by Automerger Merge Worker Apr 12, 2023

Merge "[TeX] Source code moved to modules-utils" into udc-dev am: 3982fc85 am: a214b948

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22200444

Change-Id: I483ca79124fa3fc70f90aa4871a995f761930f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents a0b4fc92 a214b948

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -411,6 +411,7 @@ java_defaults {
		"spatializer-aidl-java",
		"audiopolicy-aidl-java",
		"sounddose-aidl-java",
		"modules-utils-expresslog",
		],
		}

apex/jobscheduler/service/java/com/android/server/job/controllers/TimeController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ import android.util.TimeUtils;
		import android.util.proto.ProtoOutputStream;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.expresslog.Counter;
		import com.android.modules.expresslog.Counter;
		import com.android.server.job.JobSchedulerService;
		import com.android.server.job.StateControllerProto;

boot/boot-image-profile.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -33583,8 +33583,8 @@ Lcom/android/internal/dynamicanimation/animation/DynamicAnimation;
		Lcom/android/internal/dynamicanimation/animation/Force;
		Lcom/android/internal/dynamicanimation/animation/SpringAnimation;
		Lcom/android/internal/dynamicanimation/animation/SpringForce;
		Lcom/android/internal/expresslog/Counter;
		Lcom/android/internal/expresslog/Utils;
		Lcom/android/modules/expresslog/Counter;
		Lcom/android/modules/expresslog/Utils;
		Lcom/android/internal/graphics/ColorUtils$ContrastCalculator;
		Lcom/android/internal/graphics/ColorUtils;
		Lcom/android/internal/graphics/SfVsyncFrameCallbackProvider;

boot/preloaded-classes

+2 −2

Original line number	Diff line number	Diff line
		@@ -10784,8 +10784,8 @@ com.android.internal.dynamicanimation.animation.DynamicAnimation
		com.android.internal.dynamicanimation.animation.Force
		com.android.internal.dynamicanimation.animation.SpringAnimation
		com.android.internal.dynamicanimation.animation.SpringForce
		com.android.internal.expresslog.Counter
		com.android.internal.expresslog.Utils
		com.android.modules.expresslog.Counter
		com.android.modules.expresslog.Utils
		com.android.internal.graphics.ColorUtils$ContrastCalculator
		com.android.internal.graphics.ColorUtils
		com.android.internal.graphics.SfVsyncFrameCallbackProvider

config/boot-image-profile.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -43717,8 +43717,8 @@ Lcom/android/internal/dynamicanimation/animation/DynamicAnimation;
		Lcom/android/internal/dynamicanimation/animation/Force;
		Lcom/android/internal/dynamicanimation/animation/SpringAnimation;
		Lcom/android/internal/dynamicanimation/animation/SpringForce;
		Lcom/android/internal/expresslog/Counter;
		Lcom/android/internal/expresslog/Utils;
		Lcom/android/modules/expresslog/Counter;
		Lcom/android/modules/expresslog/Utils;
		Lcom/android/internal/graphics/ColorUtils$ContrastCalculator;
		Lcom/android/internal/graphics/ColorUtils;
		Lcom/android/internal/graphics/SfVsyncFrameCallbackProvider;