diff options
| author | 2025-01-07 11:15:49 -0800 | |
|---|---|---|
| committer | 2025-01-07 11:15:49 -0800 | |
| commit | 849940eda0be476e82694dbb50cdaa6dd4b1b83a (patch) | |
| tree | 2531e51b4dfd8fd2a5c0dd05c36d1b1dafde4d9a | |
| parent | ef3893aa43b721764d37a01c5684d8498fd9205c (diff) | |
| parent | 90b6ce3401bd6631d414780419f67a7571cb9ecc (diff) | |
Merge "Add android.os.flagging.PlatformAconfigPackage in preload list" into main am: dc94435fb8 am: 90b6ce3401
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3436679
Change-Id: I7d4c4d7c8de0dbd28bb8d323ab90a8d4748e5273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | boot/preloaded-classes | 1 | ||||
| -rw-r--r-- | config/preloaded-classes | 1 |
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 |