diff options
| author | 2024-10-10 06:02:23 +0000 | |
|---|---|---|
| committer | 2024-10-10 06:02:23 +0000 | |
| commit | cfd434148445e894ba5ae2b550dd91090b7125cf (patch) | |
| tree | 54a532f3be93ec4b675ddbc9349d7c15ac132e39 | |
| parent | 617ab83b33f92c70dab5b5ecfbfd5788867d123d (diff) | |
| parent | 750041bea2c0c96d5464a0c888db2db8c1987635 (diff) | |
Merge "Support string-array type value for bootstrap atom" into main am: 750041bea2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3286451
Change-Id: I82de126a060b2ed7a275711c69056d41cb30b345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/os/StatsBootstrapAtomValue.aidl | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/stats/bootstrap/StatsBootstrapAtomService.java | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/os/StatsBootstrapAtomValue.aidl b/core/java/android/os/StatsBootstrapAtomValue.aidl index a90dfa404ee9..b59bc062648f 100644 --- a/core/java/android/os/StatsBootstrapAtomValue.aidl +++ b/core/java/android/os/StatsBootstrapAtomValue.aidl @@ -26,4 +26,5 @@ union StatsBootstrapAtomValue { float floatValue; String stringValue; byte[] bytesValue; + String[] stringArrayValue; }
\ No newline at end of file diff --git a/services/core/java/com/android/server/stats/bootstrap/StatsBootstrapAtomService.java b/services/core/java/com/android/server/stats/bootstrap/StatsBootstrapAtomService.java index 0d420a535415..dcb47a7b60b6 100644 --- a/services/core/java/com/android/server/stats/bootstrap/StatsBootstrapAtomService.java +++ b/services/core/java/com/android/server/stats/bootstrap/StatsBootstrapAtomService.java @@ -62,6 +62,9 @@ public class StatsBootstrapAtomService extends IStatsBootstrapAtomService.Stub { case StatsBootstrapAtomValue.bytesValue: builder.writeByteArray(value.getBytesValue()); break; + case StatsBootstrapAtomValue.stringArrayValue: + builder.writeStringArray(value.getStringArrayValue()); + break; default: Slog.e(TAG, "Unexpected value type " + value.getTag() + " when logging atom " + atom.atomId); |