Merge "Allow ro. properties to have arbitrary lengths"

am: 3851f132d1 Change-Id: Ie9c340401786d97e469e283418cffef6fbbbb186
2017-10-18 18:39:42 +00:00
parent 0531e5c647 3851f132d1
commit 9fba6c2fe1
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/os/SystemProperties.java
+++ b/core/java/android/os/SystemProperties.java
@@ -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);
        }