summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Zhi Dou <zhidou@google.com> 2025-01-07 10:50:22 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-07 10:50:22 -0800
commit90b6ce3401bd6631d414780419f67a7571cb9ecc (patch)
tree55e91d70a8791e00e663db768c1a9bee9181644d
parent7d879ccd0b5c97c244063a207689a0f5cec9d9de (diff)
parentdc94435fb82f9db7de96e94aaf8b1f396cac7c53 (diff)
Merge "Add android.os.flagging.PlatformAconfigPackage in preload list" into main am: dc94435fb8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3436679 Change-Id: I282f7dff186d2747163b85f489ea2dc7ff277090 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--boot/preloaded-classes1
-rw-r--r--config/preloaded-classes1
2 files changed, 2 insertions, 0 deletions
diff --git a/boot/preloaded-classes b/boot/preloaded-classes
index b83bd4e4d401..9926aef91ee1 100644
--- a/boot/preloaded-classes
+++ b/boot/preloaded-classes
@@ -6470,6 +6470,7 @@ android.os.connectivity.WifiActivityEnergyInfo
android.os.connectivity.WifiBatteryStats$1
android.os.connectivity.WifiBatteryStats
android.os.flagging.AconfigPackage
+android.os.flagging.PlatformAconfigPackage
android.os.health.HealthKeys$Constant
android.os.health.HealthKeys$Constants
android.os.health.HealthKeys$SortedIntArray
diff --git a/config/preloaded-classes b/config/preloaded-classes
index e53c78f65877..bdd95f8e67ae 100644
--- a/config/preloaded-classes
+++ b/config/preloaded-classes
@@ -6474,6 +6474,7 @@ android.os.connectivity.WifiActivityEnergyInfo
android.os.connectivity.WifiBatteryStats$1
android.os.connectivity.WifiBatteryStats
android.os.flagging.AconfigPackage
+android.os.flagging.PlatformAconfigPackage
android.os.health.HealthKeys$Constant
android.os.health.HealthKeys$Constants
android.os.health.HealthKeys$SortedIntArray