commit 94da08fb1a24182f246fc60f725b4e57138be63f
author Ikjoon Jang <ikjn@google.com> Fri Nov 10 08:32:54 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 10 08:32:54 2023 +0000
tree d9e506106997cd0cd4f044d56a2b4c754928f0cf
parent efba4176d8923bde102903035c07c6a6e3388f49

Revert "Avoid duplicate classes in boot path."

This reverts commit efba4176d8923bde102903035c07c6a6e3388f49.

Reason for revert: DroidMonitor: Potential culprit for Bug b/310080905 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Bug: 310080905
Change-Id: Id7d6c1fbc6e58b08c14ad52b74a10adbff8abc4e

AconfigFlags.bp

diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index a65a76b..3a772e1 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -58,6 +58,7 @@
     ":android.service.autofill.flags-aconfig-java{.generated_srcjars}",
     ":com.android.net.flags-aconfig-java{.generated_srcjars}",
     ":device_policy_aconfig_flags_lib{.generated_srcjars}",
+    ":service-jobscheduler-deviceidle.flags-aconfig-java{.generated_srcjars}",
     ":surfaceflinger_flags_java_lib{.generated_srcjars}",
     ":android.view.contentcapture.flags-aconfig-java{.generated_srcjars}",
     ":android.hardware.usb.flags-aconfig-java{.generated_srcjars}",