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

Commit 18b48023 authored by Ling Ma's avatar Ling Ma Committed by Gerrit Code Review
Browse files

Merge "setProperty check for byte limit"

parents ffa0f982 8c959cde

core/java/android/os/SystemProperties.java

+3 −2
Original line number Diff line number Diff line
@@ -226,9 +226,10 @@ public class SystemProperties { 
     */

    @UnsupportedAppUsage

    public static void set(@NonNull String key, @Nullable String val) {

        if (val != null && !key.startsWith("ro.") && val.length() > PROP_VALUE_MAX) {

        if (val != null && !key.startsWith("ro.") && val.getBytes(StandardCharsets.UTF_8).length

                > PROP_VALUE_MAX) {

            throw new IllegalArgumentException("value of system property '" + key

                    + "' is longer than " + PROP_VALUE_MAX + " characters: " + val);

                    + "' is longer than " + PROP_VALUE_MAX + " bytes: " + val);

        }

        if (TRACK_KEY_ACCESS) onKeyAccess(key);

        native_set(key, val);