commit 5c8e3edf4888b622185b801dfcc8829dcd414bf8
author Elliott Hughes <enh@google.com> Thu Mar 16 05:45:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 16 05:45:47 2017 +0000
tree 8d8bac13727d756e71d4c3e029c060c3155a7b70
parent 51b64c7c0a160c3c41bc9ee3dc6656289553113d
parent 40c4210f8f8510ac12fd61530a1ee2f9e84af7f5

Merge "Restore SystemProperties.PROP_NAME_MAX to keep Kindle running." am: ef9c425416
am: 40c4210f8f

Change-Id: I264f92773692b2c5cdc58adac808630a31d2569f

core/java/android/os/SystemProperties.java

diff --git a/core/java/android/os/SystemProperties.java b/core/java/android/os/SystemProperties.java
index 2bf3c2c..c520917 100644
--- a/core/java/android/os/SystemProperties.java
+++ b/core/java/android/os/SystemProperties.java
@@ -35,6 +35,12 @@
     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>();