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

Commit 3fb72761 authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "Allow ro. properties to have arbitrary lengths" am: 3851f132 am: 9fba6c2f 

am: 918a29c8

Change-Id: I29e0ca8d91d29431b498788b548fd48e85d6669b
parents 36276fd6 918a29c8

core/java/android/os/SystemProperties.java

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ public class SystemProperties { 
     * @throws IllegalArgumentException if the {@code val} exceeds 91 characters

     */

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

        if (val != null && val.length() > PROP_VALUE_MAX) {

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

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

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

        }