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

Commit a23e891b authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge "Add support for "empty" server-side flag values"

parents a158b44d d3bfbc6a
Loading
Loading
Loading
Loading
+11 −3
Original line number Diff line number Diff line
@@ -278,11 +278,19 @@ public final class ServerFlags {
     */
    @NonNull
    public Optional<String[]> getOptionalStringArray(@DeviceConfigKey String key) {
        Optional<String> string = getOptionalString(key);
        if (!string.isPresent()) {
        Optional<String> optionalString = getOptionalString(key);
        if (!optionalString.isPresent()) {
            return Optional.empty();
        }
        return Optional.of(string.get().split(","));

        // DeviceConfig appears to have no way to specify an empty string, so we use "_[]_" as a
        // special value to mean a zero-length array.
        String value = optionalString.get();
        if ("_[]_".equals(value)) {
            return Optional.of(new String[0]);
        }

        return Optional.of(value.split(","));
    }

    /**
+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ final class ServiceConfigAccessorImpl implements ServiceConfigAccessor {
                }

                int[] priorityInts = null;
                if (priorityStrings != null && priorityStrings.length > 0) {
                if (priorityStrings != null) {
                    priorityInts = new int[priorityStrings.length];
                    try {
                        for (int i = 0; i < priorityInts.length; i++) {