diff options
author | 2025-03-05 09:23:43 -0800 | |
---|---|---|
committer | 2025-03-05 09:23:43 -0800 | |
commit | 1d909ba98c1bbda8bed88ba61478bf1ee38f02be (patch) | |
tree | 45a10780b243e74958e4050c9a36c03f2aceae30 | |
parent | c2e1e7283e42841ef80d999c5192921b8f0f4050 (diff) | |
parent | 23b4f532b1b5126ea5c41f119b53a9da792197a3 (diff) |
Merge "Ensure SystemFeaturesMetadata is initialized in the boot image" into main
-rw-r--r-- | boot/boot-image-profile-extra.txt | 7 | ||||
-rw-r--r-- | boot/preloaded-classes | 1 | ||||
-rw-r--r-- | config/preloaded-classes | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/boot/boot-image-profile-extra.txt b/boot/boot-image-profile-extra.txt index ce99bfed1ce3..cc02c8ae36e6 100644 --- a/boot/boot-image-profile-extra.txt +++ b/boot/boot-image-profile-extra.txt @@ -70,3 +70,10 @@ HSPLandroid/os/PerfettoTrackEventExtra$FieldString;->* HSPLandroid/os/PerfettoTrackEventExtra$FieldNested;->* HSPLandroid/os/PerfettoTrackEventExtra$Pool;->* HSPLandroid/os/PerfettoTrackEventExtra$RingBuffer;->* + +# While the SystemFeaturesMetadata static cache isn't heavyweight, ensure it's +# pre-initialized in the boot image to avoid redundant per-process overhead. +# TODO(b/326623529): Consider removing this after the feature has fully ramped +# and is captured with the boot image profiling pipeline. +HSPLcom/android/internal/pm/SystemFeaturesMetadata;->* +Lcom/android/internal/pm/SystemFeaturesMetadata; diff --git a/boot/preloaded-classes b/boot/preloaded-classes index f87828ec8d9a..7f4b3244c164 100644 --- a/boot/preloaded-classes +++ b/boot/preloaded-classes @@ -11885,6 +11885,7 @@ com.android.internal.os.ZygoteServer$UsapPoolRefillAction com.android.internal.os.ZygoteServer com.android.internal.os.logging.MetricsLoggerWrapper com.android.internal.pm.RoSystemFeatures +com.android.internal.pm.SystemFeaturesMetadata com.android.internal.pm.parsing.PackageParser2$Callback com.android.internal.pm.parsing.PackageParserException com.android.internal.pm.pkg.component.flags.FeatureFlags diff --git a/config/preloaded-classes b/config/preloaded-classes index 4147fd7c4ae6..707acb00b102 100644 --- a/config/preloaded-classes +++ b/config/preloaded-classes @@ -11921,6 +11921,7 @@ com.android.internal.os.ZygoteServer$UsapPoolRefillAction com.android.internal.os.ZygoteServer com.android.internal.os.logging.MetricsLoggerWrapper com.android.internal.pm.RoSystemFeatures +com.android.internal.pm.SystemFeaturesMetadata com.android.internal.pm.parsing.PackageParser2$Callback com.android.internal.pm.parsing.PackageParserException com.android.internal.pm.pkg.component.flags.FeatureFlags |