commit 3c8775b6a7429613aef3abd95d748d4b96448ebd
author Zhi Dou <zhidou@google.com> Mon Dec 09 18:48:36 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 09 18:48:36 2024 +0000
tree 92069606305155af68a3c59abcde017158f046a4
parent 18a8b326a526ae5b5721f1680663f50b23df02a7
parent 340592ddbd66874539a0952eda1ecc3d5a30b1e0

Merge "Add android.os.flagging.AconfigPackage in preload list" into main am: 340592ddbd

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

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

boot/preloaded-classes

diff --git a/boot/preloaded-classes b/boot/preloaded-classes
index a696e03..afd9984 100644
--- a/boot/preloaded-classes
+++ b/boot/preloaded-classes
@@ -6469,6 +6469,7 @@
 android.os.connectivity.WifiActivityEnergyInfo
 android.os.connectivity.WifiBatteryStats$1
 android.os.connectivity.WifiBatteryStats
+android.os.flagging.AconfigPackage
 android.os.health.HealthKeys$Constant
 android.os.health.HealthKeys$Constants
 android.os.health.HealthKeys$SortedIntArray

config/preloaded-classes

diff --git a/config/preloaded-classes b/config/preloaded-classes
index ed40276..343de0b 100644
--- a/config/preloaded-classes
+++ b/config/preloaded-classes
@@ -6473,6 +6473,7 @@
 android.os.connectivity.WifiActivityEnergyInfo
 android.os.connectivity.WifiBatteryStats$1
 android.os.connectivity.WifiBatteryStats
+android.os.flagging.AconfigPackage
 android.os.health.HealthKeys$Constant
 android.os.health.HealthKeys$Constants
 android.os.health.HealthKeys$SortedIntArray