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

am dbd03924: Merge "Fix wrap property creation when truncating."

Browse Source 
* commit 'dbd03924d83ab03e6e8e45d1d041dc8d162180cf':
  Fix wrap property creation when truncating.
This commit is contained in:
Christopher Ferris
2015-01-29 23:51:16 +00:00
committed by Android Git Automerger
parent fb696894ee dbd03924d8
commit e7a69cbf92
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

@@ -800,7 +800,12 @@ class ZygoteConnection {
if (args.niceName != null) { if (args.niceName != null) {
String property = "wrap." + args.niceName; String property = "wrap." + args.niceName;
if (property.length() > 31) { 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); args.invokeWith = SystemProperties.get(property);
if (args.invokeWith != null && args.invokeWith.length() == 0) { if (args.invokeWith != null && args.invokeWith.length() == 0) {