Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am fd41feee: Merge "Fix wrap property creation when truncating." into lmp-mr1-dev

Browse Source 
* commit 'fd41feee6b909670010da79a0800c1aa2ce44255':
  Fix wrap property creation when truncating.
This commit is contained in:
Christopher Ferris
2015-01-30 02:33:34 +00:00
committed by Android Git Automerger
parent 4649dcd7c4 fd41feee6b
commit 5d0cf917c3
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/os/ZygoteConnection.java
View File

@@ -842,7 +842,12 @@ class ZygoteConnection {
if (args.niceName != null) {
String property = "wrap." + args.niceName;
if (property.length() > 31) {
property = property.substring(0, 31);
// Avoid creating an illegal property name when truncating.
if (property.charAt(30) != '.') {
property = property.substring(0, 31);
} else {
property = property.substring(0, 30);
}
}
args.invokeWith = SystemProperties.get(property);
if (args.invokeWith != null && args.invokeWith.length() == 0) {