Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9228b084 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Support string-array type value for bootstrap atom" into main am: 750041be am: cfd43414 

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



Change-Id: Id721ca8cb94aa164d01fae5c427387f299b8e6fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bb0e2c55 cfd43414

core/java/android/os/StatsBootstrapAtomValue.aidl

+1 −0
Original line number Diff line number Diff line
@@ -26,4 +26,5 @@ union StatsBootstrapAtomValue { 
    float floatValue;

    String stringValue;

    byte[] bytesValue;

    String[] stringArrayValue;

}
 
 No newline at end of file

services/core/java/com/android/server/stats/bootstrap/StatsBootstrapAtomService.java

+3 −0
Original line number Diff line number Diff line
@@ -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);