summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tom Cherry <tomcherry@google.com> 2017-10-18 18:39:42 +0000
committer android-build-merger <android-build-merger@google.com> 2017-10-18 18:39:42 +0000
commit9fba6c2fe1187ecdb4dbb309fcccd5e89921918a (patch)
tree4ff23016559fe56ea14132cfd7b12302aed173e5
parent0531e5c6474265698841f07d40f2e84f5f13d547 (diff)
parent3851f132d10db766f1d9a49099ec19a84957afad (diff)
Merge "Allow ro. properties to have arbitrary lengths"
am: 3851f132d1 Change-Id: Ie9c340401786d97e469e283418cffef6fbbbb186
-rw-r--r--core/java/android/os/SystemProperties.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/SystemProperties.java b/core/java/android/os/SystemProperties.java
index 84111fbf7f93..4f6d322ba871 100644
--- 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);
}