summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2017-03-16 05:50:23 +0000
committer android-build-merger <android-build-merger@google.com> 2017-03-16 05:50:23 +0000
commitec50f7031c81280700197dc32211ff419f7f9713 (patch)
treeab7318e6b152bc48e49f31660d6b9651decdadd5
parent287452cf404d5a7bacb78d0b763bb6c04010cbed (diff)
parent5c8e3edf4888b622185b801dfcc8829dcd414bf8 (diff)
Merge "Restore SystemProperties.PROP_NAME_MAX to keep Kindle running." am: ef9c425416 am: 40c4210f8f
am: 5c8e3edf48 Change-Id: I4fbdbbb12b7854fcca22de2790c14d315ef44c53
-rw-r--r--core/java/android/os/SystemProperties.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/os/SystemProperties.java b/core/java/android/os/SystemProperties.java
index b525193c1b9c..8632194f2b02 100644
--- a/core/java/android/os/SystemProperties.java
+++ b/core/java/android/os/SystemProperties.java
@@ -35,6 +35,12 @@ public class SystemProperties {
private static final String TAG = "SystemProperties";
private static final boolean TRACK_KEY_ACCESS = false;
+ /**
+ * Android O removed the property name length limit, but com.amazon.kindle 7.8.1.5
+ * uses reflection to read this whenever text is selected (http://b/36095274).
+ */
+ public static final int PROP_NAME_MAX = Integer.MAX_VALUE;
+
public static final int PROP_VALUE_MAX = 91;
private static final ArrayList<Runnable> sChangeCallbacks = new ArrayList<Runnable>();